Mercurial > prosody-hg
diff net/server.lua @ 7242:d0296db76ccd
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Mar 2016 23:44:21 +0000 |
| parents | 8e64e7b82928 |
| children | 23a8a26e8912 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Mar 2016 23:44:21 +0000 |
| parents | 8e64e7b82928 |
| children | 23a8a26e8912 |