aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-04-03 06:39:28 +0200
committerKim Alvefur <zash@zash.se>2015-04-03 06:39:28 +0200
commit12d6e03b5b62d8974f98492112a70fc754b5cb28 (patch)
tree0ddb52bfa4a521df1e6ef7b9f54e3e3d615597a2 /net/server.lua
parent315e3b3b937c22224c4530a194420f1b2fd77316 (diff)
parent28c58565ace33870970010c9d195c5da5d9cf4d1 (diff)
downloadprosody-12d6e03b5b62d8974f98492112a70fc754b5cb28.tar.gz
prosody-12d6e03b5b62d8974f98492112a70fc754b5cb28.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions