aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-28 01:56:22 +0200
committerKim Alvefur <zash@zash.se>2014-09-28 01:56:22 +0200
commitb0190726e5b46b3accb081366c921839b8ee2441 (patch)
treecfaf4c445383819dc32ada72c88e3f18079d9b30 /net/server.lua
parent865f1b1e8f99ab70c45cb2a4f94df34a2cb190ea (diff)
parentbf317774d921f17f73443b59008970a68f756082 (diff)
downloadprosody-b0190726e5b46b3accb081366c921839b8ee2441.tar.gz
prosody-b0190726e5b46b3accb081366c921839b8ee2441.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions