diff options
| author | Kim Alvefur <zash@zash.se> | 2015-08-22 21:01:00 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-08-22 21:01:00 +0200 |
| commit | e58beaa308ceb3ce53acdac6c299c7f3a7d019c8 (patch) | |
| tree | a0c17c572b7a4b9677802bc11a2aa82bb460a502 /net/server.lua | |
| parent | 79198d6ca143dc666c91b036873d6a7a1df7166a (diff) | |
| parent | ffb9f937a19f6041d24731ef49f7c281ecc2876d (diff) | |
| download | prosody-e58beaa308ceb3ce53acdac6c299c7f3a7d019c8.tar.gz prosody-e58beaa308ceb3ce53acdac6c299c7f3a7d019c8.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions