aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-08-06 16:58:21 +0200
committerKim Alvefur <zash@zash.se>2018-08-06 16:58:21 +0200
commit3adccdd08cd6225924f886019b8b6de4be889163 (patch)
treef0c9819502c08952e09629e0fdd3a3c494e7c97d /prosody
parentb0a52c384fe2077eac33bf4f7ef25080b4272f6b (diff)
parent4d905e149101e7bef4bfdafafa4bc56e4bb80630 (diff)
downloadprosody-3adccdd08cd6225924f886019b8b6de4be889163.tar.gz
prosody-3adccdd08cd6225924f886019b8b6de4be889163.zip
Merge jonasw->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions