diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-03-17 19:16:43 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-03-17 19:16:43 +0000 |
commit | 2e443086a9b85b2b39b6d1b15c1a36c3894eaa2e (patch) | |
tree | 554b21ae3a5aed22205975f61994d87a561099b3 /core/configmanager.lua | |
parent | c08a9c7d78063b4632f54468d3d3a0cbf0a1f204 (diff) | |
parent | aa6d79191613b687877e39b54732d875ea0ee767 (diff) | |
download | prosody-2e443086a9b85b2b39b6d1b15c1a36c3894eaa2e.tar.gz prosody-2e443086a9b85b2b39b6d1b15c1a36c3894eaa2e.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions