diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-09 10:17:39 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-09 10:17:39 +0100 |
commit | c3d9a2c11d362fcd1677d169af395c1f7bb8d4f1 (patch) | |
tree | f74647d6ef7f599b9f5283ae25b85c10ac124a2e /net/server.lua | |
parent | ea5d14cb81bd618da08e46fc4a314379d8df46ca (diff) | |
parent | 9aed5f791f903dd1d5bd997fcb15bcece4c8e9e4 (diff) | |
download | prosody-c3d9a2c11d362fcd1677d169af395c1f7bb8d4f1.tar.gz prosody-c3d9a2c11d362fcd1677d169af395c1f7bb8d4f1.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions