diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-06 18:52:22 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-06 18:52:22 +0100 |
commit | 41d0ddcf70e0f04dec8f4fc7e7485b250eeb7d9d (patch) | |
tree | 1b515562c7b44102f77bb4fd6ec1f232db3b4ee1 /core/configmanager.lua | |
parent | dbe8e388f79ec416564fcefe9c6f82cea887a36b (diff) | |
parent | da4afcbab756e737eefb53ddbe18f80b31115276 (diff) | |
download | prosody-41d0ddcf70e0f04dec8f4fc7e7485b250eeb7d9d.tar.gz prosody-41d0ddcf70e0f04dec8f4fc7e7485b250eeb7d9d.zip |
Merge trunk->0.10
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions