Mercurial > prosody-hg
diff net/server.lua @ 6826:17a4e89a4780
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 04 Sep 2015 11:11:40 +0100 |
| parents | 4224abbf0fdd |
| children | 8e64e7b82928 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 04 Sep 2015 11:11:40 +0100 |
| parents | 4224abbf0fdd |
| children | 8e64e7b82928 |