aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-03-22 21:13:09 +0100
committerKim Alvefur <zash@zash.se>2020-03-22 21:13:09 +0100
commit6bfe774cab77d494a15da52a289cfb4b68de6d7a (patch)
tree34537ef426e6f55fa507b93b2479506d3865da93 /prosody
parentb9c78541d727cfef9d016ff6c471bb46830280e2 (diff)
parent277b88a8def42159d4e77f12ddb462caba55d7c3 (diff)
downloadprosody-6bfe774cab77d494a15da52a289cfb4b68de6d7a.tar.gz
prosody-6bfe774cab77d494a15da52a289cfb4b68de6d7a.zip
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions