Mercurial > prosody-hg
comparison core/hostmanager.lua @ 7242:d0296db76ccd
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Mar 2016 23:44:21 +0000 |
| parents | fa6cd0e9105d |
| children | 3a6f5b0f56f0 |
comparison
equal
deleted
inserted
replaced
| 7240:bf8aa0d1951c | 7242:d0296db76ccd |
|---|
