diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-10 17:00:10 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-10 17:00:10 +0200 |
commit | e06f1294be5799b2bb70d8c3b5f2ad5816a2bc0d (patch) | |
tree | 52c29734b165fdace6d9af676cc69f55e818831d /core/s2smanager.lua | |
parent | 73579026ea1c955372484e57006bef2811f792c7 (diff) | |
parent | 64e565546890b709a23ce3d3077e69d7822a6703 (diff) | |
download | prosody-e06f1294be5799b2bb70d8c3b5f2ad5816a2bc0d.tar.gz prosody-e06f1294be5799b2bb70d8c3b5f2ad5816a2bc0d.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions