aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-19 18:23:44 +0200
committerKim Alvefur <zash@zash.se>2016-04-19 18:23:44 +0200
commitbcaeb22eb70574d9a025e3a6d87e2c7d7b786654 (patch)
treea73f0e5a8a0c4d19faa2ab9da327b9b5568d1d31 /prosody
parentac987c6332df2b94fd9a7457e20392ae2be5207f (diff)
parentbe79af9fbb47f35b0bccf0337e8035e5b070d390 (diff)
downloadprosody-bcaeb22eb70574d9a025e3a6d87e2c7d7b786654.tar.gz
prosody-bcaeb22eb70574d9a025e3a6d87e2c7d7b786654.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions