diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-28 05:15:13 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-28 05:15:13 +0200 |
commit | a247428e6a3a75c2007a27bc5da390683aa9cf2f (patch) | |
tree | 82455e93e2c274a0b0bbf97d893d869712b507b5 /net/server.lua | |
parent | 3c3f9aca729288b173af2707adcbfe6ed6450d1d (diff) | |
parent | 21b40df00e20d9d78fb8f4129dad2c8d52c7bde6 (diff) | |
download | prosody-a247428e6a3a75c2007a27bc5da390683aa9cf2f.tar.gz prosody-a247428e6a3a75c2007a27bc5da390683aa9cf2f.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions