aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-11-20 15:01:47 +0100
committerKim Alvefur <zash@zash.se>2014-11-20 15:01:47 +0100
commit1875a89b0269a92b965298f3ca9f234630e11721 (patch)
tree1942217f4c99d9e88151d983acabdd514ac04386 /net/server.lua
parent1717f1f2e18c51a7c3091f4a98f35db0b1de6860 (diff)
parent6d35997e95d6491c72dcfc4b1ecf782e7542fbe5 (diff)
downloadprosody-1875a89b0269a92b965298f3ca9f234630e11721.tar.gz
prosody-1875a89b0269a92b965298f3ca9f234630e11721.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions