diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-26 14:54:39 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-26 14:54:39 +0100 |
commit | bd7661932c7f620a72cbded20299e72d9e83e5c0 (patch) | |
tree | 4ae873335fac8ab24744036958a1be02552a52bd /core/configmanager.lua | |
parent | 1c4e23ccddeffdc45eb6de28460205f5da7fab82 (diff) | |
parent | 935e3cce462a650a95208dbdfa11aad5409c2547 (diff) | |
download | prosody-bd7661932c7f620a72cbded20299e72d9e83e5c0.tar.gz prosody-bd7661932c7f620a72cbded20299e72d9e83e5c0.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions