diff options
author | Kim Alvefur <zash@zash.se> | 2016-07-14 13:41:02 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-07-14 13:41:02 +0200 |
commit | ccadcc9b4710fcf04c51d01cb40611efd5f7b835 (patch) | |
tree | 7f1c0c36f5c9dadc79cbec11d668ba0bdef0d36f /core/configmanager.lua | |
parent | 3616de36510d613e3eb2e75e730f5066bfa41741 (diff) | |
parent | 81dba787f4875f51e6d376231373600401c99411 (diff) | |
download | prosody-ccadcc9b4710fcf04c51d01cb40611efd5f7b835.tar.gz prosody-ccadcc9b4710fcf04c51d01cb40611efd5f7b835.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions