aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-11-23 17:42:48 +0100
committerKim Alvefur <zash@zash.se>2017-11-23 17:42:48 +0100
commit8fad47a0c616242cade2b81d7b54af6ea8c7176b (patch)
tree1a9a9b40cf43fe8ee9bc407011deab06739b8a00 /prosody
parent9290f9588a329280e41dd51fbb2895e46e7e29ed (diff)
parent27d99dd43b75773ce537a7fdd2977987a3f913a0 (diff)
downloadprosody-8fad47a0c616242cade2b81d7b54af6ea8c7176b.tar.gz
prosody-8fad47a0c616242cade2b81d7b54af6ea8c7176b.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions