Mercurial > prosody-hg
diff core/configmanager.lua @ 8060:71bdfdf6565d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 04 Apr 2017 01:41:09 +0200 |
| parents | 24170d74b00b |
| children | c22d5680ca68 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 04 Apr 2017 01:41:09 +0200 |
| parents | 24170d74b00b |
| children | c22d5680ca68 |