aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-08-18 17:36:46 +0200
committerKim Alvefur <zash@zash.se>2016-08-18 17:36:46 +0200
commit782117034dc44969e35e4d35663045e5658b2913 (patch)
treea89e877c6e83d9aa3b79825812361591bf12bf2e /net/server.lua
parent5e5b45be6ea322d815872a499ba85d4584cd28fd (diff)
parentf30f5f62189373fe8a2081d1117fbc2977331f26 (diff)
downloadprosody-782117034dc44969e35e4d35663045e5658b2913.tar.gz
prosody-782117034dc44969e35e4d35663045e5658b2913.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions