aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-03-05 23:44:21 +0000
committerMatthew Wild <mwild1@gmail.com>2016-03-05 23:44:21 +0000
commit0d5b89d026386e62529faf8f264be3a43fb3c81e (patch)
treed6290d436593437443a2409fce2f36b64275a8c3 /net/server.lua
parenta1bcc0b591ed004d4414127aa314e550f04bfe7d (diff)
parent61a708fcd1a3c9a7a6f88787e47365ebd20fad60 (diff)
downloadprosody-0d5b89d026386e62529faf8f264be3a43fb3c81e.tar.gz
prosody-0d5b89d026386e62529faf8f264be3a43fb3c81e.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions