Mercurial > prosody-hg
diff core/configmanager.lua @ 6145:69bc9dfcbd89
Merge daurnimator->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 21 Apr 2014 17:42:44 +0100 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 21 Apr 2014 17:42:44 +0100 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |