Mercurial > prosody-hg
diff core/configmanager.lua @ 7505:3d950ee0de35
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 14 Jul 2016 13:41:02 +0200 |
| parents | 6236668da30a |
| children | 24170d74b00b |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 14 Jul 2016 13:41:02 +0200 |
| parents | 6236668da30a |
| children | 24170d74b00b |