aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-19 17:37:52 +0100
committerKim Alvefur <zash@zash.se>2016-11-19 17:37:52 +0100
commitfa06e78161ae895c625f78ed745766d4569d6876 (patch)
treea4e4f275e9d2fa0c365a3f06ce1834356f37111c /prosody
parentc9778ba770df13acaf5e528b3f8905de108164e5 (diff)
parentc3a4324ff10f956611014f1550124db6aabc4941 (diff)
downloadprosody-fa06e78161ae895c625f78ed745766d4569d6876.tar.gz
prosody-fa06e78161ae895c625f78ed745766d4569d6876.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions