aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-04-10 19:03:36 +0200
committerKim Alvefur <zash@zash.se>2020-04-10 19:03:36 +0200
commit64ea805d66d7d17b4272caa61cb0fa91a021a9ca (patch)
treee9598d04b21e9996068f2fc128f939797146460e /prosody
parentfc3e9ae033556f915d6ac565545f8ee11f884151 (diff)
parent96620cafe5f8aa651c449ab930703a7032c990b5 (diff)
downloadprosody-64ea805d66d7d17b4272caa61cb0fa91a021a9ca.tar.gz
prosody-64ea805d66d7d17b4272caa61cb0fa91a021a9ca.zip
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions