diff options
author | Kim Alvefur <zash@zash.se> | 2018-06-09 15:47:59 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-06-09 15:47:59 +0200 |
commit | 10dd45398909d8a2f5081f9501c26460f738d388 (patch) | |
tree | 2012e72c749814da4062b2a5dd0ff6b7725f5aa9 /net/server.lua | |
parent | d74f8ee65dc4b5bcb3716f1f3039e8017ef774a3 (diff) | |
parent | 5ae35f54cc69163c9d0c0f3e9bb40b07542af9c0 (diff) | |
download | prosody-10dd45398909d8a2f5081f9501c26460f738d388.tar.gz prosody-10dd45398909d8a2f5081f9501c26460f738d388.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions