aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-02-25 18:08:30 +0100
committerKim Alvefur <zash@zash.se>2017-02-25 18:08:30 +0100
commit8be8bbf789df743f2abd4a8be41183952a0f6375 (patch)
tree1a7a643f5edc71c9cee4f86eda81c48f4a9cf122 /prosody
parenta330175614a22c622261e6a70b23c92b2a841bd4 (diff)
parent41c35464f7c214d30365f4c26619a82bad1e0b48 (diff)
downloadprosody-8be8bbf789df743f2abd4a8be41183952a0f6375.tar.gz
prosody-8be8bbf789df743f2abd4a8be41183952a0f6375.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions