diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-02 16:32:37 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-02 16:32:37 +0100 |
commit | 70a7adc1c1340992b85b63c248fe913c199782e3 (patch) | |
tree | 6211defc2dd3e7e7270b5fbd54bbbd6fd8660445 /net/server.lua | |
parent | 47450a0eff25547333f561ff2903f92d081c9bdf (diff) | |
parent | e83b7f442b4988bcb62f4e73234d5e25929ea1b7 (diff) | |
download | prosody-70a7adc1c1340992b85b63c248fe913c199782e3.tar.gz prosody-70a7adc1c1340992b85b63c248fe913c199782e3.zip |
Merge 0.9->0.10
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions