aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-11-17 15:48:32 +0100
committerKim Alvefur <zash@zash.se>2018-11-17 15:48:32 +0100
commit84440f2e91632d32c5484165547b4c3495fca2c0 (patch)
treeb7dd1f7b94bc4a621e3f8785701731acdf5aa017 /net
parent4b9b245dc0ec77a2ee8ca99e5a6ec88e301703a6 (diff)
parent320392f1d11e27b89f8ce0556812465c1bf1ed40 (diff)
downloadprosody-84440f2e91632d32c5484165547b4c3495fca2c0.tar.gz
prosody-84440f2e91632d32c5484165547b4c3495fca2c0.zip
Merge 0.11->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions