diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-06 15:31:21 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-06 15:31:21 +0100 |
commit | 2a77d2a3a435cbd2f62b0f7675d7eb1ee027a093 (patch) | |
tree | 12c170f5c451cd6de06f1b842d220909e39f46e9 /net/server.lua | |
parent | ca65f0d2d3718301b880c0260c991cd8ee7977ae (diff) | |
parent | 11dc53576d751ef7e62bc439831d35f74de74e5b (diff) | |
download | prosody-2a77d2a3a435cbd2f62b0f7675d7eb1ee027a093.tar.gz prosody-2a77d2a3a435cbd2f62b0f7675d7eb1ee027a093.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions