aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-24 00:32:09 +0100
committerKim Alvefur <zash@zash.se>2017-03-24 00:32:09 +0100
commit816b44f0642d5ba90355b6683a03e64e13396ef6 (patch)
tree74698345ef518ef640b15ba5c705a0cb0302d66f /net
parentfcaed765157cd655ef028f74994bf4033912de2c (diff)
parentf2b2195de45826747826751df89ed4aee9577988 (diff)
downloadprosody-816b44f0642d5ba90355b6683a03e64e13396ef6.tar.gz
prosody-816b44f0642d5ba90355b6683a03e64e13396ef6.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions