Software / code / prosody
Comparison
core/configmanager.lua @ 6693:365f0f885aa5
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 14 May 2015 00:24:21 +0200 |
| parent | 6326:a3b9496673ee |
| child | 6712:29d5875ae38d |
comparison
equal
deleted
inserted
replaced
| 6690:b2e89583d6e6 | 6693:365f0f885aa5 |
|---|