Software / code / prosody
Comparison
core/configmanager.lua @ 6907:a24c9c1edd67
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 17 Oct 2015 19:30:58 +0200 |
| parent | 6779:6236668da30a |
| child | 7947:24170d74b00b |
comparison
equal
deleted
inserted
replaced
| 6904:633af47470c8 | 6907:a24c9c1edd67 |
|---|