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
commit8e1cca01e9779c7bc0f216fc51d77fa288d0865b (patch)
tree12eacc631d6df28fa731ec8c15923a43d2bbae19 /net/server.lua
parenta7b9c6de423f4f4572aaf81674903a27fbcd7c67 (diff)
parent9b5bd658a403fd1b1a7321d3d37ae2e8b8cba9a0 (diff)
downloadprosody-8e1cca01e9779c7bc0f216fc51d77fa288d0865b.tar.gz
prosody-8e1cca01e9779c7bc0f216fc51d77fa288d0865b.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions