diff options
author | Matthew Wild <mwild1@gmail.com> | 2018-04-04 18:42:05 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2018-04-04 18:42:05 +0100 |
commit | 3990f293e219a92e5da856b8d17c53533227e088 (patch) | |
tree | 192dddbb9a5b935e8686f7b67a483a028fd67fec /net/server.lua | |
parent | 054e1807e5c7e26e9ec0b3ce762de5a42fb0e651 (diff) | |
parent | bef96be8a083272ef67fc19e8e6654659a2d19c5 (diff) | |
download | prosody-3990f293e219a92e5da856b8d17c53533227e088.tar.gz prosody-3990f293e219a92e5da856b8d17c53533227e088.zip |
Merge 0.10 -> trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions