diff options
author | Kim Alvefur <zash@zash.se> | 2017-05-27 16:42:50 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-05-27 16:42:50 +0200 |
commit | 2de6a3c39488f2f545e4f70cd7b36addc283f34d (patch) | |
tree | 63f6c38195e6899a068269e4d7a1eb67c0382ecd /net/server.lua | |
parent | 06b5c50c4e4751e54ca01175d2898bb88cd84819 (diff) | |
parent | df7d65413de0e9b9ed047dd701a400fd8873d0ec (diff) | |
download | prosody-2de6a3c39488f2f545e4f70cd7b36addc283f34d.tar.gz prosody-2de6a3c39488f2f545e4f70cd7b36addc283f34d.zip |
Merge 0.9->0.10
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions