Mercurial > prosody-hg
diff core/configmanager.lua @ 6525:7c273da3cff6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Nov 2014 15:01:47 +0100 |
| parents | a3b9496673ee |
| children | 29d5875ae38d |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Nov 2014 15:01:47 +0100 |
| parents | a3b9496673ee |
| children | 29d5875ae38d |