diff options
author | Kim Alvefur <zash@zash.se> | 2014-06-30 13:12:16 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-06-30 13:12:16 +0200 |
commit | 6c75e23434fd4ba3eed580582ade3ad8337fd585 (patch) | |
tree | 188fe2fddec81c249b952dca48e7f61546e44351 /core/configmanager.lua | |
parent | 55a097981ec6c98f4dd3115e143c066fbe90d8e3 (diff) | |
parent | 7dd5829ef95b16d62e45a7cfec5986b023342670 (diff) | |
download | prosody-6c75e23434fd4ba3eed580582ade3ad8337fd585.tar.gz prosody-6c75e23434fd4ba3eed580582ade3ad8337fd585.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions