aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-14 14:20:37 +0100
committerKim Alvefur <zash@zash.se>2016-03-14 14:20:37 +0100
commit3ec49d31afc719ec2bec5dee640e41c11f52fe62 (patch)
treed4ea3062e7b9fa8bd642485d15f1b745082f621f /net/server.lua
parent17c850ba33a950b7a4482a6c656cef734768bf8a (diff)
parentd1578059cb3152347cddb265cf4b224741dc3997 (diff)
downloadprosody-3ec49d31afc719ec2bec5dee640e41c11f52fe62.tar.gz
prosody-3ec49d31afc719ec2bec5dee640e41c11f52fe62.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions