diff options
author | Kim Alvefur <zash@zash.se> | 2018-05-25 03:33:13 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-05-25 03:33:13 +0200 |
commit | dedba5658ee72c68a5c94b6d7093fe4d77ebbcdc (patch) | |
tree | 9d7db4f22ab5aeb436958158bd5bc14285a7f05a /net/server.lua | |
parent | be2d5e7266de46093a08f7ff736749a77607425f (diff) | |
parent | 400d3337aa56b347069cb967a6e8547dc54a8a06 (diff) | |
download | prosody-dedba5658ee72c68a5c94b6d7093fe4d77ebbcdc.tar.gz prosody-dedba5658ee72c68a5c94b6d7093fe4d77ebbcdc.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions