aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-05-11 21:35:08 +0100
committerMatthew Wild <mwild1@gmail.com>2012-05-11 21:35:08 +0100
commitc28bdf985351a3dc12bb50e9286b01238720cdfa (patch)
treeb2a35f6af2780d1bf095189c7cbaaf0c84c3e15b /net/server.lua
parent4cdc92746f4c4f2c11aa79a3e37c4d2c5b3681b8 (diff)
parentfa3580abaa5d1bc4a9fef50c0372d55fa5a139e8 (diff)
downloadprosody-c28bdf985351a3dc12bb50e9286b01238720cdfa.tar.gz
prosody-c28bdf985351a3dc12bb50e9286b01238720cdfa.zip
Merge with backout
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions