Mercurial > prosody-hg
diff net/server.lua @ 8922:47d318eeff8d
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 22 Jun 2018 13:21:42 +0100 |
| parents | 9932a2a5b6de |
| children | b087b5047f86 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 22 Jun 2018 13:21:42 +0100 |
| parents | 9932a2a5b6de |
| children | b087b5047f86 |