aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-02-10 21:34:16 +0100
committerKim Alvefur <zash@zash.se>2017-02-10 21:34:16 +0100
commit594cd2890617a6472ba44b5146cf613d97a72b26 (patch)
treeb94754ed8abee90a404d2914f4e02e5e7ec38310 /prosody
parente902bcea2ee39bf7fdeda44d9f28dd8c893084d7 (diff)
parenta586901308157ae912d86292adf3ca6704217521 (diff)
downloadprosody-594cd2890617a6472ba44b5146cf613d97a72b26.tar.gz
prosody-594cd2890617a6472ba44b5146cf613d97a72b26.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions