aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-21 15:22:17 +0200
committerKim Alvefur <zash@zash.se>2017-04-21 15:22:17 +0200
commit708f82e198006129be93ea2d60504c30d200ee06 (patch)
treeb96edba7a396231bd9a41c1dd9cb9fcf11879642 /net
parent8e1cca01e9779c7bc0f216fc51d77fa288d0865b (diff)
parent279badc8aec122e4533560e2b34cf9021a8a75c4 (diff)
downloadprosody-708f82e198006129be93ea2d60504c30d200ee06.tar.gz
prosody-708f82e198006129be93ea2d60504c30d200ee06.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions