diff options
| author | Kim Alvefur <zash@zash.se> | 2014-07-25 21:16:52 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-07-25 21:16:52 +0200 |
| commit | 5c2035b30a344e8bc45ffe4c7329c603cd8e6cd3 (patch) | |
| tree | 0190a83e1d446f56057f182c2393ca855b3285e0 /core | |
| parent | 6f4e24a0fc86a839792d0dda5a99746179231fd0 (diff) | |
| parent | 069a36e4758fac28ad5c89cb8a5f8a4bb3fed71f (diff) | |
| download | prosody-5c2035b30a344e8bc45ffe4c7329c603cd8e6cd3.tar.gz prosody-5c2035b30a344e8bc45ffe4c7329c603cd8e6cd3.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 eb1ce733..b5674ece 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -29,7 +29,7 @@ pcall = function(f, ...) return xpcall(function() return f(unpack(params, 1, n)) end, function(e) return tostring(e).."\n"..debug_traceback(); end); end -local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s"}; +local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s", "s2s_auth_certs"}; local component_inheritable_modules = {"tls", "saslauth", "dialback", "iq", "s2s"}; -- We need this to let modules access the real global namespace |