diff options
author | Kim Alvefur <zash@zash.se> | 2015-09-19 17:51:20 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-09-19 17:51:20 +0200 |
commit | 4c2ff994e81dc411ccaf3288cdd3f5c67a80d035 (patch) | |
tree | 47cf9d27ab4a9fef0167cf77f3674b183d9837fc /net/server.lua | |
parent | d00deda2fdc2c024a6f54f5293c8194e46cb9c3b (diff) | |
parent | 27ded264411da3caa885ef86a07f72da8376a438 (diff) | |
download | prosody-4c2ff994e81dc411ccaf3288cdd3f5c67a80d035.tar.gz prosody-4c2ff994e81dc411ccaf3288cdd3f5c67a80d035.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions