diff options
author | Kim Alvefur <zash@zash.se> | 2017-06-13 20:14:06 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-06-13 20:14:06 +0200 |
commit | 90f15e025ef70d8e062af4947dfad999541d0495 (patch) | |
tree | 98d1b668d63a65c58e169d1f7d3912050ef66de1 /plugins/mod_s2s/mod_s2s.lua | |
parent | c4def1909c1050c1852b92c90910fbe0abadcaba (diff) | |
parent | f8aad6ad60886d13f595e159fc6ad4bf2f136d5b (diff) | |
download | prosody-90f15e025ef70d8e062af4947dfad999541d0495.tar.gz prosody-90f15e025ef70d8e062af4947dfad999541d0495.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
0 files changed, 0 insertions, 0 deletions