diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-26 11:55:27 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-26 11:55:27 +0200 |
commit | d300932f7b75b891e6dfcf7d568d796c227b9502 (patch) | |
tree | c7d9b10298595fe019de63ce1fb4853be587de49 /core/s2smanager.lua | |
parent | 30a4f36e03d8fad67839ee27ee037967ab50b385 (diff) | |
parent | 4e955bb01926b7fafe8e3d892807833382e50634 (diff) | |
download | prosody-d300932f7b75b891e6dfcf7d568d796c227b9502.tar.gz prosody-d300932f7b75b891e6dfcf7d568d796c227b9502.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
0 files changed, 0 insertions, 0 deletions