Mercurial > prosody-hg
diff core/configmanager.lua @ 7104:352270bc0439 0.9.10
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 27 Jan 2016 00:06:30 +0100 |
| parents | 5926f01e5cd2 |
| children | a3b9496673ee |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 27 Jan 2016 00:06:30 +0100 |
| parents | 5926f01e5cd2 |
| children | a3b9496673ee |