diff options
author | Matthew Wild <mwild1@gmail.com> | 2018-06-07 11:24:29 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2018-06-07 11:24:29 +0100 |
commit | ad149e788d750baf48dbfb8dbbaa4e7e831ddba7 (patch) | |
tree | 2ac15830c1ec94f100df281388f350cac4d0a50f /core/configmanager.lua | |
parent | ca514bcbf6c9784279f8f6f4ae616fa7b309cb83 (diff) | |
parent | 29ebeb2da4fb62c8bfb3fe278e7908c07204be78 (diff) | |
download | prosody-ad149e788d750baf48dbfb8dbbaa4e7e831ddba7.tar.gz prosody-ad149e788d750baf48dbfb8dbbaa4e7e831ddba7.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions