diff options
| author | Kim Alvefur <zash@zash.se> | 2015-09-24 20:15:19 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-09-24 20:15:19 +0200 |
| commit | b415f80bd6a623b351126d86deb4734984b7e32b (patch) | |
| tree | 12d7f0ee52b21fe124cc849278902ba715a35b32 /net/server.lua | |
| parent | 26574b47a73b824bc0bb1ac28f47de379ac2c64d (diff) | |
| parent | 7dda2051767b494cba55b3b8c3a3086b60252f9a (diff) | |
| download | prosody-b415f80bd6a623b351126d86deb4734984b7e32b.tar.gz prosody-b415f80bd6a623b351126d86deb4734984b7e32b.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions