aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-20 03:11:27 +0100
committerKim Alvefur <zash@zash.se>2017-03-20 03:11:27 +0100
commitc160b029b0eeff8c57d8ddcde8a5f7c424074631 (patch)
treeebce784d8a5d08c50eb50fb1ab530afa46dd1782 /prosody
parent29b64a45009858091f41e6443561299cac3416b8 (diff)
parent83d1e9570a93cbea53e0420ada95e7273695fe78 (diff)
downloadprosody-c160b029b0eeff8c57d8ddcde8a5f7c424074631.tar.gz
prosody-c160b029b0eeff8c57d8ddcde8a5f7c424074631.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions