Mercurial > prosody-hg
diff core/configmanager.lua @ 6038:b3ceb7627e27
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 25 Mar 2014 19:16:38 +0100 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 25 Mar 2014 19:16:38 +0100 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |