Mercurial > prosody-hg
diff net/server.lua @ 7256:9fbb9fbf7e52
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 09 Mar 2016 13:19:38 +0000 |
| parents | 8e64e7b82928 |
| children | 23a8a26e8912 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 09 Mar 2016 13:19:38 +0000 |
| parents | 8e64e7b82928 |
| children | 23a8a26e8912 |