diff options
author | Kim Alvefur <zash@zash.se> | 2019-05-26 19:41:58 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-05-26 19:41:58 +0200 |
commit | 48d6fa1aa122769a56d81c57276e46b27b63f101 (patch) | |
tree | 11a618b505748faf115684e27aa45b2a622e80a9 /core/s2smanager.lua | |
parent | 61d02f359982574f857674bc314ac121f2735189 (diff) | |
parent | a6e44a24a0afdfb34a74d15a98b3a1f05e54cf9a (diff) | |
download | prosody-48d6fa1aa122769a56d81c57276e46b27b63f101.tar.gz prosody-48d6fa1aa122769a56d81c57276e46b27b63f101.zip |
Merge 0.11->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions