Software / code / prosody
Comparison
core/configmanager.lua @ 6068:175590cc7b07
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 10 Apr 2014 13:16:54 +0200 |
| parent | 5814:5cf1c08805fb |
| child | 6164:ef4024f6bc40 |
comparison
equal
deleted
inserted
replaced
| 6059:0cbdf7243540 | 6068:175590cc7b07 |
|---|