Mercurial > prosody-hg
diff core/configmanager.lua @ 6370:3cfbd3f2c658
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Aug 2014 12:23:58 +0100 |
| parents | a3b9496673ee |
| children | 29d5875ae38d |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Aug 2014 12:23:58 +0100 |
| parents | a3b9496673ee |
| children | 29d5875ae38d |