diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:40:39 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:40:39 +0100 |
commit | 088d94cf1e4c14e24a36d609ae255d51c23f3614 (patch) | |
tree | 1f8626c471d0a192eaa46cc4ea40325a43a5469f /core/s2smanager.lua | |
parent | 669449342ff7f72b94149861c8dbf156d0343e1a (diff) | |
parent | ebadd3e469bfb4dd5b4d71ba8270b3ed6a82805d (diff) | |
download | prosody-088d94cf1e4c14e24a36d609ae255d51c23f3614.tar.gz prosody-088d94cf1e4c14e24a36d609ae255d51c23f3614.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions