aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2017-07-28 23:47:38 +0100
committerMatthew Wild <mwild1@gmail.com>2017-07-28 23:47:38 +0100
commit30eb28a6f684a0c2beaa99cab409783183855c5a (patch)
treebb5d484ebc965b8a30388ebbb7a1e67234f4877b /net
parentf34c948d32a8de89c608ebea7a84c69a9718886e (diff)
parent9e56ca2f4ade97f373175fedb05cb8bbc94499c3 (diff)
downloadprosody-im-server-30eb28a6f684a0c2beaa99cab409783183855c5a.tar
prosody-im-server-30eb28a6f684a0c2beaa99cab409783183855c5a.zip
Merge 0.10 -> trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions