diff options
| author | Kim Alvefur <zash@zash.se> | 2014-03-25 19:16:38 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-03-25 19:16:38 +0100 |
| commit | f7d4b04bf17c8b634eae00e814a995a88c5ba6cb (patch) | |
| tree | 1dd9879238a7c2f688f02d2b61ed2877da2e9989 /core | |
| parent | 03559cb06e7abb0245c2a73c75ad9a49297b48f6 (diff) | |
| parent | aff3965927ff8763b477b97a4be4f477186738a0 (diff) | |
| download | prosody-f7d4b04bf17c8b634eae00e814a995a88c5ba6cb.tar.gz prosody-f7d4b04bf17c8b634eae00e814a995a88c5ba6cb.zip | |
Merge 0.9->0.10
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; |