aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-04 13:18:06 +0100
committerKim Alvefur <zash@zash.se>2017-01-04 13:18:06 +0100
commit56a3538054ec1dc3f39f314d4059abc31d25b0d7 (patch)
tree43f10899307d8645eb9e5274aeefef13347bf9d1 /prosody
parent934231da3fd3160a4085b67b4b04b67bc0532945 (diff)
parenta6e9f2a8cdef8f284b76f409aca0c96b5dc85c57 (diff)
downloadprosody-56a3538054ec1dc3f39f314d4059abc31d25b0d7.tar.gz
prosody-56a3538054ec1dc3f39f314d4059abc31d25b0d7.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions