Mercurial > prosody-hg
diff net/server_select.lua @ 7530:f14094d10925
Merge 0.10 -> trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Jul 2016 09:39:50 +0100 |
| parents | 3d950ee0de35 71ef4a4104d3 |
| children | 6d6a04628954 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Jul 2016 09:39:50 +0100 |
| parents | 3d950ee0de35 71ef4a4104d3 |
| children | 6d6a04628954 |