aboutsummaryrefslogtreecommitdiffstats
path: root/core/modulemanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-02-24 16:23:46 +0000
committerMatthew Wild <mwild1@gmail.com>2012-02-24 16:23:46 +0000
commitb26626109f7bbe808303787f619b67cb64792269 (patch)
treede23e9acf420ce5ae271837be41e71f46350c79c /core/modulemanager.lua
parentddef415e167351b9197a06bfd1d401e70dd37e13 (diff)
parent0f9c104f0cb7f20a63bf6f890d0d04a690418a1d (diff)
downloadprosody-b26626109f7bbe808303787f619b67cb64792269.tar.gz
prosody-b26626109f7bbe808303787f619b67cb64792269.zip
Merge Zash with Florob and Maranda
Diffstat (limited to 'core/modulemanager.lua')
-rw-r--r--core/modulemanager.lua2
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