Mercurial > prosody-hg
diff core/configmanager.lua @ 7647:e9d7a409e236
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 31 Aug 2016 16:25:21 +0100 |
| parents | 6236668da30a |
| children | 24170d74b00b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 31 Aug 2016 16:25:21 +0100 |
| parents | 6236668da30a |
| children | 24170d74b00b |