diff options
author | daurnimator <quae@daurnimator.com> | 2014-09-29 13:59:16 -0400 |
---|---|---|
committer | daurnimator <quae@daurnimator.com> | 2014-09-29 13:59:16 -0400 |
commit | acf786ed7dcca32a0ee768fac6f33d35674fc1b6 (patch) | |
tree | 8df3d5f560f6323de29139b602f253e16dddcbeb /net/server.lua | |
parent | f03bdbefca10dd64cd70208bf84261fb850d1be8 (diff) | |
parent | 0504583316908806a24c975e9acb775a44d2c317 (diff) | |
download | prosody-acf786ed7dcca32a0ee768fac6f33d35674fc1b6.tar.gz prosody-acf786ed7dcca32a0ee768fac6f33d35674fc1b6.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions