Mercurial > prosody-hg
diff core/configmanager.lua @ 8015:ecb110f45c92
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 28 Mar 2017 20:14:35 +0200 |
| parents | 24170d74b00b |
| children | c22d5680ca68 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 28 Mar 2017 20:14:35 +0200 |
| parents | 24170d74b00b |
| children | c22d5680ca68 |