diff options
author | Kim Alvefur <zash@zash.se> | 2017-12-01 04:54:23 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-12-01 04:54:23 +0100 |
commit | f31e73eb4857a08a82825a19e65a765d2848491b (patch) | |
tree | d52e9b6b8097ddc42cc9ae912b982a51195a6384 /core/configmanager.lua | |
parent | 6d29dae97fd196145d982813aaa7a94b615a982c (diff) | |
parent | 066b90ccffc05ecc98df624c7b8a1a97ae526dc9 (diff) | |
download | prosody-f31e73eb4857a08a82825a19e65a765d2848491b.tar.gz prosody-f31e73eb4857a08a82825a19e65a765d2848491b.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions