diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-20 14:46:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-20 14:46:27 +0100 |
| commit | 36d18cfeaa6c9b2d10e2e26d346c3f767c5b10a1 (patch) | |
| tree | 768406645ad3b21dc73929c51634ccca66acb7ae /net/server.lua | |
| parent | acc11c8eb3ed2b827150eed78761007856eb2e36 (diff) | |
| parent | bd64d50dd4408de6e75856fe25c1ee41aa7b78f9 (diff) | |
| download | prosody-36d18cfeaa6c9b2d10e2e26d346c3f767c5b10a1.tar.gz prosody-36d18cfeaa6c9b2d10e2e26d346c3f767c5b10a1.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions