diff options
author | Kim Alvefur <zash@zash.se> | 2016-01-08 16:21:05 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-01-08 16:21:05 +0100 |
commit | 8cdd08825d3ab4afddc12ddf75dc9af1924e8518 (patch) | |
tree | b72ea8b35e4dae603543a1b490f959f32b930870 /core/configmanager.lua | |
parent | 3d0f3a9db092d06daa782135077acfaf9b40b69c (diff) | |
parent | b3d9c810676d288d193e4dcc3d95456e8a050f0e (diff) | |
download | prosody-8cdd08825d3ab4afddc12ddf75dc9af1924e8518.tar.gz prosody-8cdd08825d3ab4afddc12ddf75dc9af1924e8518.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions