aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-11-13 11:59:43 +0100
committerKim Alvefur <zash@zash.se>2013-11-13 11:59:43 +0100
commitd8155aef2c5323708f59d95540aafd1824eedcb9 (patch)
tree35e7e5c860fce3eb29284d9bdeb98bd167cce04f /plugins/mod_s2s
parent525a4393c735f83b6471941333e4a6ab7483a640 (diff)
parentf454faa15bdbccc23b805dcb110e985cb0ff0295 (diff)
downloadprosody-d8155aef2c5323708f59d95540aafd1824eedcb9.tar.gz
prosody-d8155aef2c5323708f59d95540aafd1824eedcb9.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
0 files changed, 0 insertions, 0 deletions