aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2014-09-29 13:59:16 -0400
committerdaurnimator <quae@daurnimator.com>2014-09-29 13:59:16 -0400
commitacf786ed7dcca32a0ee768fac6f33d35674fc1b6 (patch)
tree8df3d5f560f6323de29139b602f253e16dddcbeb /net/server.lua
parentf03bdbefca10dd64cd70208bf84261fb850d1be8 (diff)
parent0504583316908806a24c975e9acb775a44d2c317 (diff)
downloadprosody-acf786ed7dcca32a0ee768fac6f33d35674fc1b6.tar.gz
prosody-acf786ed7dcca32a0ee768fac6f33d35674fc1b6.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions