aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-22 01:31:52 +0200
committerKim Alvefur <zash@zash.se>2015-09-22 01:31:52 +0200
commit26574b47a73b824bc0bb1ac28f47de379ac2c64d (patch)
treef6ad57a51df3f189d7ece7f43682e7ccd147537c /net/server.lua
parent4c2ff994e81dc411ccaf3288cdd3f5c67a80d035 (diff)
parent4e24283711de37e3db92ebe0f93e26c55d516eda (diff)
downloadprosody-26574b47a73b824bc0bb1ac28f47de379ac2c64d.tar.gz
prosody-26574b47a73b824bc0bb1ac28f47de379ac2c64d.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions