Software / code / prosody
Diff
net/server_select.lua @ 7042:20ac6972b9aa
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 02 Jan 2016 20:42:53 +0000 |
| parent | 6820:40d50c239564 |
| parent | 7041:aff786e7b4ce |
| child | 7046:6b4232125f32 |
line wrap: on
line diff