aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-11-30 16:03:09 +0100
committerKim Alvefur <zash@zash.se>2018-11-30 16:03:09 +0100
commit51e0d4e0e1827520e526637d893b64e3c7fa67cd (patch)
tree7ae91e4f4df4e2605e4f199f6f82ae0841ff7b91 /net
parent2e3e5db959672f2175223d670d106f1202e95f49 (diff)
parentb105494187675a7ff55010e4691581b90bc97c22 (diff)
downloadprosody-51e0d4e0e1827520e526637d893b64e3c7fa67cd.tar.gz
prosody-51e0d4e0e1827520e526637d893b64e3c7fa67cd.zip
Merge 0.11->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions