diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-05-13 17:00:27 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-05-13 17:00:27 +0100 |
commit | a885794fccabfc6dc8cc8e52f83c8ac865ddd8c8 (patch) | |
tree | 65bc2e4d57655c0f62aec527649de4e5f46296d4 /plugins/mod_s2s/mod_s2s.lua | |
parent | daec51c435ca77914271200607841d55ff7408d7 (diff) | |
parent | 2f7ac943416fa13023e9d061ffc8020811a4ebf0 (diff) | |
download | prosody-a885794fccabfc6dc8cc8e52f83c8ac865ddd8c8.tar.gz prosody-a885794fccabfc6dc8cc8e52f83c8ac865ddd8c8.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
0 files changed, 0 insertions, 0 deletions