diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-19 20:02:58 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-19 20:02:58 +0200 |
commit | 71582ed712975252a9db4e99067ffdf048c6c419 (patch) | |
tree | e52f761fb502153924cebccb346f39d132f20e90 /net/server.lua | |
parent | a3522c0f2d4a751b6c2809a82e431dc88190f657 (diff) | |
parent | 02fb1f6f662e4bede4f676e4b8de8d80944ced65 (diff) | |
download | prosody-71582ed712975252a9db4e99067ffdf048c6c419.tar.gz prosody-71582ed712975252a9db4e99067ffdf048c6c419.zip |
Merge 0.9->0.10
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions