Software / code / prosody
Diff
core/configmanager.lua @ 6050:5d73412aa1ba 0.9.4
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 01 Apr 2014 16:03:21 +0100 |
| parent | 5811:27ae988f5b70 |
| child | 5814:5cf1c08805fb |
| child | 6166:46cb87d531a7 |
