diff options
author | Kim Alvefur <zash@zash.se> | 2016-12-19 09:34:40 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-12-19 09:34:40 +0100 |
commit | 0b94607fcc49a9abd09515966e0218e2393b2ec3 (patch) | |
tree | 22c3bd86a1b1249c79c21e3f12989991ef540d33 /plugins/mod_s2s/mod_s2s.lua | |
parent | 4ce8f255107391bc040fde22b153cfc0049fb3f9 (diff) | |
parent | 6e6d42e3c0617a38fe8e6a358c82c38e286ca352 (diff) | |
download | prosody-0b94607fcc49a9abd09515966e0218e2393b2ec3.tar.gz prosody-0b94607fcc49a9abd09515966e0218e2393b2ec3.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
0 files changed, 0 insertions, 0 deletions