Mercurial > prosody-hg
comparison core/configmanager.lua @ 8203:a7863f4aae65
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 29 Aug 2017 15:24:53 +0200 |
| parents | b4cbd65ee4c5 |
| children | 4f0f5b49bb03 |
comparison
equal
deleted
inserted
replaced
| 8201:a0ad62a269df | 8203:a7863f4aae65 |
|---|
