aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-09 01:25:58 +0200
committerKim Alvefur <zash@zash.se>2017-04-09 01:25:58 +0200
commitf01822fbfc55fa0cdde361c179f02b044ceb7bcf (patch)
treea7e90b6f576bc528b0ad1033667f07f208df5497 /prosody
parentf2f1aa7473e3e9c668a77044c93560e3c914cc50 (diff)
parent54fea3aeec367884bd249ca317662eac07c66861 (diff)
downloadprosody-f01822fbfc55fa0cdde361c179f02b044ceb7bcf.tar.gz
prosody-f01822fbfc55fa0cdde361c179f02b044ceb7bcf.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions