aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-11-22 15:52:10 +0000
committerMatthew Wild <mwild1@gmail.com>2015-11-22 15:52:10 +0000
commit217d0135d1da5f00a8b21dcca8b61ff16dd126d0 (patch)
tree3e427379d7463fcf546ddc9318100d488a5d5908 /net/server.lua
parente4f2d5b6cd12d6f850ab39acb7a311efd9a2aaec (diff)
parentc3b43754d587da5a1f8c474990ebcb3642deadab (diff)
downloadprosody-217d0135d1da5f00a8b21dcca8b61ff16dd126d0.tar.gz
prosody-217d0135d1da5f00a8b21dcca8b61ff16dd126d0.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions