diff options
author | Kim Alvefur <zash@zash.se> | 2018-10-14 14:19:21 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-10-14 14:19:21 +0200 |
commit | 29c9d1f50885e0c6aab08b7ddf4fe1eda08c05cc (patch) | |
tree | a23bf30a53b66556bed5c3a232ce1a6bd2b2bb10 /net/server.lua | |
parent | fcdc8d9ff1048a99025874a056cf5464d1d71184 (diff) | |
parent | 2a573e5c5e09a049fb8350edf756da4ca92ebebc (diff) | |
download | prosody-29c9d1f50885e0c6aab08b7ddf4fe1eda08c05cc.tar.gz prosody-29c9d1f50885e0c6aab08b7ddf4fe1eda08c05cc.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions