aboutsummaryrefslogtreecommitdiffstats
path: root/core/configmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-05-20 15:00:50 +0200
committerKim Alvefur <zash@zash.se>2017-05-20 15:00:50 +0200
commit31449a33114f4c183969bfca6e7572ac481bc35a (patch)
treea9f889946fe0b378627047ddcff3fe5e45fcc1ff /core/configmanager.lua
parent5fab418c7297225df592a6118ea7054e05a3268f (diff)
parent6c2de6971756e87dc7ce5165182128b4dbc05f2d (diff)
downloadprosody-31449a33114f4c183969bfca6e7572ac481bc35a.tar.gz
prosody-31449a33114f4c183969bfca6e7572ac481bc35a.zip
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions