aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-31 19:01:42 +0200
committerKim Alvefur <zash@zash.se>2017-03-31 19:01:42 +0200
commit6abd0a8f1ad20e719151a4027c8ae5d1d8ba719c (patch)
treebee3cc0bc75de8d1aa4fb7ea7ca6571c449ac139 /net/server.lua
parent0646752a74aa5f7f0383000d64cd669474209d22 (diff)
parent79bc05914a516cf0d005b6adff8b264be907eaa0 (diff)
downloadprosody-6abd0a8f1ad20e719151a4027c8ae5d1d8ba719c.tar.gz
prosody-6abd0a8f1ad20e719151a4027c8ae5d1d8ba719c.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions