diff options
author | Kim Alvefur <zash@zash.se> | 2018-06-10 17:56:38 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-06-10 17:56:38 +0200 |
commit | ae35950f7cd081ace7f6b3751e121888daf8a3d6 (patch) | |
tree | 73727eb5ec93c048019ee773d3ea0ddc9404b9e7 /core/s2smanager.lua | |
parent | 0c7f971a484cc7b93d599ea8f0d8878a04fa994f (diff) | |
parent | 054cdafd57234e9b22cf6178552df1d1929b86ad (diff) | |
download | prosody-ae35950f7cd081ace7f6b3751e121888daf8a3d6.tar.gz prosody-ae35950f7cd081ace7f6b3751e121888daf8a3d6.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions