aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-05-18 02:01:20 +0200
committerKim Alvefur <zash@zash.se>2017-05-18 02:01:20 +0200
commitcdb000e818930f9622ecf4bdacae7a9c6ca80a2f (patch)
tree25f6f21b26940f5d7ca24465b103c7b46f453fc3 /prosody
parent9b9d6a9ba97ee9160fcd4d28e2509ca768d15de7 (diff)
parentc5fc8dc1c188d9cd1283aabb8848f975cac71d71 (diff)
downloadprosody-cdb000e818930f9622ecf4bdacae7a9c6ca80a2f.tar.gz
prosody-cdb000e818930f9622ecf4bdacae7a9c6ca80a2f.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions