Mercurial > prosody-hg
comparison core/hostmanager.lua @ 7341:aa94cd27df4d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 06 Apr 2016 14:50:34 +0200 |
| parents | fa6cd0e9105d |
| children | 3a6f5b0f56f0 |
comparison
equal
deleted
inserted
replaced
| 7338:f8d37227acd7 | 7341:aa94cd27df4d |
|---|
