Mercurial > prosody-hg
diff core/configmanager.lua @ 6285:ea60d0441df7
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Jun 2014 15:05:52 +0200 |
| parents | 5af7fe1014db |
| children | a3b9496673ee |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Jun 2014 15:05:52 +0200 |
| parents | 5af7fe1014db |
| children | a3b9496673ee |