diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-05-22 02:16:57 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-05-22 02:16:57 +0100 |
commit | f66e61803bb5b49d2e13b2b93c5b5e4b05d2233b (patch) | |
tree | 53931683faf71081483998cb1589b8c0ac77d063 /core/configmanager.lua | |
parent | 04d0a3f94cd9d6d544bf064cc47f85f45cf1d415 (diff) | |
parent | 8a32b7f2c3787e5fa3c235bc5681930f7873f508 (diff) | |
download | prosody-f66e61803bb5b49d2e13b2b93c5b5e4b05d2233b.tar.gz prosody-f66e61803bb5b49d2e13b2b93c5b5e4b05d2233b.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions