Mercurial > prosody-hg
diff net/server.lua @ 8410:54ff1f91e4db
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 21 Nov 2017 23:16:16 +0100 |
| parents | 9606a99f8617 |
| children | a0f728c3aa69 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 21 Nov 2017 23:16:16 +0100 |
| parents | 9606a99f8617 |
| children | a0f728c3aa69 |