aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-08-28 05:15:13 +0200
committerKim Alvefur <zash@zash.se>2016-08-28 05:15:13 +0200
commit2ec447915fd44c0baf523247b529374074f595e0 (patch)
tree82455e93e2c274a0b0bbf97d893d869712b507b5 /net/server.lua
parent82a62b94c73a228abc03cf1bb8f55318e4eb8bb6 (diff)
parentf6fd68b0dd80dc3f225b7e1ee710ecf369f8f283 (diff)
downloadprosody-2ec447915fd44c0baf523247b529374074f595e0.tar.gz
prosody-2ec447915fd44c0baf523247b529374074f595e0.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions