diff options
author | Kim Alvefur <zash@zash.se> | 2015-12-06 02:43:01 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-12-06 02:43:01 +0100 |
commit | c4c602c47ff1aebd6475729fb9c2ac52c8d60034 (patch) | |
tree | b85775cefb4f2e0b5029a51f806cbac03d606c7e /net/server.lua | |
parent | e5e327d5dbf8a7504fb909b4795d27ebe82e7cdc (diff) | |
parent | dcda8abb47990e330a9e844d37ff6a956b995f14 (diff) | |
download | prosody-c4c602c47ff1aebd6475729fb9c2ac52c8d60034.tar.gz prosody-c4c602c47ff1aebd6475729fb9c2ac52c8d60034.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions