diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-24 11:20:00 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-24 11:20:00 +0100 |
commit | 9a7bce4946a4a302905bdccd23ce59dc245803e8 (patch) | |
tree | 60121c160143098d7d661c2dcafd57af5c4ea5de /plugins/mod_s2s/mod_s2s.lua | |
parent | 349f3e7a755249a16acf5417f9bea95c0df77513 (diff) | |
parent | bdabf32dc62bc1d62fe9954c82be48a60ea7232a (diff) | |
download | prosody-9a7bce4946a4a302905bdccd23ce59dc245803e8.tar.gz prosody-9a7bce4946a4a302905bdccd23ce59dc245803e8.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
0 files changed, 0 insertions, 0 deletions