diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-07-27 14:08:32 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-07-27 14:08:32 +0100 |
commit | e68e90bd30e81a46052bcf33ea8da344dfc0557b (patch) | |
tree | a1568a41de954c6611e3334860644f96a2866121 /core/s2smanager.lua | |
parent | 2368529f517e1b3c1a038da50d569b112f61977c (diff) | |
parent | 79940f40e79e453383693bb7e2559e3e335b87dc (diff) | |
download | prosody-e68e90bd30e81a46052bcf33ea8da344dfc0557b.tar.gz prosody-e68e90bd30e81a46052bcf33ea8da344dfc0557b.zip |
Merge 0.10 -> trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions