prosody
09255a10fdfa
core/modulemanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/modulemanager.lua @ 4573:09255a10fdfa

Merge Zash with Florob and Maranda
author Matthew Wild <mwild1@gmail.com>
date Fri, 24 Feb 2012 16:23:46 +0000
parent 4565:5a2212d3468e
child 4604:eef5e3a83792
line wrap: on
line diff
--- a/core/modulemanager.lua	Thu Feb 23 23:12:24 2012 +0100
+++ b/core/modulemanager.lua	Fri Feb 24 16:23:46 2012 +0000
@@ -34,7 +34,7 @@
 
 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