diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-03-26 20:17:59 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-03-26 20:17:59 +0000 |
commit | 7b609609f929e1125b9347d7fb0b8e080da3ce5c (patch) | |
tree | 3cab508593e54c925311eb26dca38f0bc86ee3d4 /core/configmanager.lua | |
parent | bd7661932c7f620a72cbded20299e72d9e83e5c0 (diff) | |
parent | b246855e0a0f1dd97e0fd509388ca8fc8596e62e (diff) | |
download | prosody-7b609609f929e1125b9347d7fb0b8e080da3ce5c.tar.gz prosody-7b609609f929e1125b9347d7fb0b8e080da3ce5c.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions