Mercurial > prosody-hg
diff core/configmanager.lua @ 9617:655b8d36a8a4
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 11 Nov 2018 02:31:09 +0100 |
| parents | 2d82a926826f |
| children | c9f5ccdcdf80 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 11 Nov 2018 02:31:09 +0100 |
| parents | 2d82a926826f |
| children | c9f5ccdcdf80 |