diff options
| author | Kim Alvefur <zash@zash.se> | 2014-03-25 19:18:32 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-03-25 19:18:32 +0100 |
| commit | a479cb0e199235e6ba72de332f3994551cfa2cbb (patch) | |
| tree | 652efec3423f31c2562f4eab50e0bd3d48bf884c /core | |
| parent | f74e377a23600b3284f2cc9c4676c9836bae9d89 (diff) | |
| parent | f7d4b04bf17c8b634eae00e814a995a88c5ba6cb (diff) | |
| download | prosody-a479cb0e199235e6ba72de332f3994551cfa2cbb.tar.gz prosody-a479cb0e199235e6ba72de332f3994551cfa2cbb.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/modulemanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 2e488fd5..eb1ce733 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -30,7 +30,7 @@ pcall = function(f, ...) end local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s"}; -local component_inheritable_modules = {"tls", "dialback", "iq", "s2s"}; +local component_inheritable_modules = {"tls", "saslauth", "dialback", "iq", "s2s"}; -- We need this to let modules access the real global namespace local _G = _G; |