diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-09 01:25:58 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-09 01:25:58 +0200 |
| commit | fcca450715b5ccb94002dc9dd2babfe214955f4b (patch) | |
| tree | a7e90b6f576bc528b0ad1033667f07f208df5497 /net/server.lua | |
| parent | 0bdb7ab1f9104098e894c2acd033bc205081f61a (diff) | |
| parent | 6dee387e59b090d0244d322fdf8e6a2077f2ef39 (diff) | |
| download | prosody-fcca450715b5ccb94002dc9dd2babfe214955f4b.tar.gz prosody-fcca450715b5ccb94002dc9dd2babfe214955f4b.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions