Mercurial > prosody-hg
diff core/configmanager.lua @ 7242:d0296db76ccd
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Mar 2016 23:44:21 +0000 |
| parents | 6236668da30a |
| children | 24170d74b00b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Mar 2016 23:44:21 +0000 |
| parents | 6236668da30a |
| children | 24170d74b00b |