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 | 8c0d996be4f47b77a02668474d3d8a0a41bd0f98 (patch) | |
| tree | 1dd9879238a7c2f688f02d2b61ed2877da2e9989 /core | |
| parent | 18f7ffec151b965af2745600f272db50a1c92ad2 (diff) | |
| parent | e4ea0b094a43dd93fab253dff36efbe8aa3dc330 (diff) | |
| download | prosody-8c0d996be4f47b77a02668474d3d8a0a41bd0f98.tar.gz prosody-8c0d996be4f47b77a02668474d3d8a0a41bd0f98.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; |