diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-09-07 19:33:14 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-09-07 19:33:14 +0100 |
commit | be23c86153168e94b567f6d6a5da9bf282f7b9b7 (patch) | |
tree | 1857990266cbbb0ea2050db25290aeaee0419b54 /core/configmanager.lua | |
parent | dd19060f7b29e86a934540259f1387655e910fdb (diff) | |
parent | 8460485ee0ab18d480d45d427445e2862c21c3d6 (diff) | |
download | prosody-be23c86153168e94b567f6d6a5da9bf282f7b9b7.tar.gz prosody-be23c86153168e94b567f6d6a5da9bf282f7b9b7.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions