diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-03 07:25:05 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-03 07:25:05 +0100 |
| commit | 7a257adaffd2bc14ac33045c4563d428b41d69cb (patch) | |
| tree | c840902603d1482af5f9156d6170461fd47b8e69 /core | |
| parent | 4159b9cfe19ede5b674a3328944c4ca02de99cd7 (diff) | |
| parent | c92bbefd9c5e36913afe0d796a84df180faaf0af (diff) | |
| download | prosody-7a257adaffd2bc14ac33045c4563d428b41d69cb.tar.gz prosody-7a257adaffd2bc14ac33045c4563d428b41d69cb.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 2ad2fc17..2e488fd5 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 = {"presence", "message", "iq", "offline", "c2s", "s2s"}; +local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s"}; local component_inheritable_modules = {"tls", "dialback", "iq", "s2s"}; -- We need this to let modules access the real global namespace |