aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-06-10 01:20:05 +0200
committerKim Alvefur <zash@zash.se>2018-06-10 01:20:05 +0200
commit0c7f971a484cc7b93d599ea8f0d8878a04fa994f (patch)
tree349dd0220f89e02d73610850acd422d6862ffe4c /net
parentf4edab7047ed425561e429c2be064fd20ef258ad (diff)
parentb7fc41affc5f5ae2f726b3c17e89fc7deb6b81f7 (diff)
downloadprosody-0c7f971a484cc7b93d599ea8f0d8878a04fa994f.tar.gz
prosody-0c7f971a484cc7b93d599ea8f0d8878a04fa994f.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions