diff options
author | Kim Alvefur <zash@zash.se> | 2018-07-07 21:00:59 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-07-07 21:00:59 +0200 |
commit | e7cae3b63ebaa30fe7bc77c6c0d1c030bd83d83a (patch) | |
tree | 74e7237a7e9ba964dd0f82a3546e4e9950891716 /net/server.lua | |
parent | 02b86f45f97b3db52b3e9597abf6f9e5aaba8302 (diff) | |
parent | 81da3564dcab51e1677b15eaf02baf0f0abd8d0e (diff) | |
download | prosody-e7cae3b63ebaa30fe7bc77c6c0d1c030bd83d83a.tar.gz prosody-e7cae3b63ebaa30fe7bc77c6c0d1c030bd83d83a.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions