diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-02-24 16:23:46 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-02-24 16:23:46 +0000 |
| commit | 07151a029c71a7d868003f5ab3c76d4e9812eb2d (patch) | |
| tree | de23e9acf420ce5ae271837be41e71f46350c79c /core/modulemanager.lua | |
| parent | f397b79717e372748b156e4874d0b0a483a2c134 (diff) | |
| parent | 39a677bc8af8e6e97e896afb72e986ae7cbb9a7e (diff) | |
| download | prosody-07151a029c71a7d868003f5ab3c76d4e9812eb2d.tar.gz prosody-07151a029c71a7d868003f5ab3c76d4e9812eb2d.zip | |
Merge Zash with Florob and Maranda
Diffstat (limited to 'core/modulemanager.lua')
| -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 a192e637..0ca37105 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -34,7 +34,7 @@ end local array, set = require "util.array", require "util.set"; -local autoload_modules = {"presence", "message", "iq", "offline"}; +local autoload_modules = {"presence", "message", "iq", "offline", "c2s", "s2s"}; local component_inheritable_modules = {"tls", "dialback", "iq"}; -- We need this to let modules access the real global namespace |