diff options
author | Kim Alvefur <zash@zash.se> | 2017-05-20 15:00:50 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-05-20 15:00:50 +0200 |
commit | 31449a33114f4c183969bfca6e7572ac481bc35a (patch) | |
tree | a9f889946fe0b378627047ddcff3fe5e45fcc1ff /core/configmanager.lua | |
parent | 5fab418c7297225df592a6118ea7054e05a3268f (diff) | |
parent | 6c2de6971756e87dc7ce5165182128b4dbc05f2d (diff) | |
download | prosody-31449a33114f4c183969bfca6e7572ac481bc35a.tar.gz prosody-31449a33114f4c183969bfca6e7572ac481bc35a.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions