Mercurial > prosody-hg
diff net/server.lua @ 7467:9a73c85baffe
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jul 2016 15:12:44 +0200 |
| parents | 8e64e7b82928 |
| children | 23a8a26e8912 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jul 2016 15:12:44 +0200 |
| parents | 8e64e7b82928 |
| children | 23a8a26e8912 |