diff options
author | Kim Alvefur <zash@zash.se> | 2017-09-29 13:45:03 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-09-29 13:45:03 +0200 |
commit | ca622317f100d67023e2088179011eb61a243a2d (patch) | |
tree | cd04cb8a03e077a91511ed8d509a4e2e83588628 /net/server.lua | |
parent | db450adf9e7f6dbb96cddb15a8b929f367435981 (diff) | |
parent | 37d1497aedaf666ed0a1c4d5eeb47c54b1efd98c (diff) | |
download | prosody-ca622317f100d67023e2088179011eb61a243a2d.tar.gz prosody-ca622317f100d67023e2088179011eb61a243a2d.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions