diff options
| author | Matthew Wild <mwild1@gmail.com> | 2018-05-16 23:50:08 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2018-05-16 23:50:08 +0100 |
| commit | 3754dac5822f0eed7253db31635d48c5db27dc5d (patch) | |
| tree | 8cba4635246c19cb8ca893a69d456539ab99a920 /core/configmanager.lua | |
| parent | e3979fddddf4f4621a2509b9c933c1f7e24e1360 (diff) | |
| parent | 6a8358e64753fca28bcae3d85cfd6cc8560b79de (diff) | |
| download | prosody-3754dac5822f0eed7253db31635d48c5db27dc5d.tar.gz prosody-3754dac5822f0eed7253db31635d48c5db27dc5d.zip | |
Merge 0.10 -> trunk
This commit intentionally drops changes from c2b99fa134b3
and 8da11142fabf which are based on older MUC code.
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions