aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-20 16:21:13 +0200
committerKim Alvefur <zash@zash.se>2017-04-20 16:21:13 +0200
commit418962b61c0f94621515125c59185d428bce1327 (patch)
tree12eacc631d6df28fa731ec8c15923a43d2bbae19 /net/server.lua
parent56fa06726426891f0ebc7c3bfc7e69ec38ec0a12 (diff)
parentd7900a6980737c8fd3c7f51794a003c96f264a75 (diff)
downloadprosody-418962b61c0f94621515125c59185d428bce1327.tar.gz
prosody-418962b61c0f94621515125c59185d428bce1327.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions