diff options
author | Kim Alvefur <zash@zash.se> | 2017-09-16 17:24:56 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-09-16 17:24:56 +0200 |
commit | 8178f6a7ae1b04667e57439562a60bc62cc7cdd8 (patch) | |
tree | 76f61bd739e0765ddd524d399759fa5abcd3e496 /core/configmanager.lua | |
parent | 880a7c3e32681f1380dd72ecbe794177df126ff1 (diff) | |
parent | 6ab32342b28e6394ff81fcdc8918049ec9196a67 (diff) | |
download | prosody-8178f6a7ae1b04667e57439562a60bc62cc7cdd8.tar.gz prosody-8178f6a7ae1b04667e57439562a60bc62cc7cdd8.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions