Mercurial > prosody-hg
diff core/configmanager.lua @ 6354:bbb4a82db32e
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Aug 2014 19:22:08 +0200 |
| parents | a3b9496673ee |
| children | 29d5875ae38d |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Aug 2014 19:22:08 +0200 |
| parents | a3b9496673ee |
| children | 29d5875ae38d |