diff options
author | Kim Alvefur <zash@zash.se> | 2017-05-27 17:30:16 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-05-27 17:30:16 +0200 |
commit | 3513190931f213b9f661dde88db87ddbfd531b35 (patch) | |
tree | 04a1c3f3af54f4b092c83cce4df035594f3b6ac1 /core/configmanager.lua | |
parent | 240b0bb53ec6286c5cdce7d8ca10af514a00bb0f (diff) | |
parent | 607f7ee607b814000ac65e1e032ee4a20c91116e (diff) | |
download | prosody-3513190931f213b9f661dde88db87ddbfd531b35.tar.gz prosody-3513190931f213b9f661dde88db87ddbfd531b35.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions