diff options
author | Kim Alvefur <zash@zash.se> | 2014-09-23 01:44:16 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-09-23 01:44:16 +0200 |
commit | 19e5326754d02e3a35e14bbbf25ff1c8fed1098d (patch) | |
tree | 1e63192849a869212df2448f814cb37c91b04fe5 /core/modulemanager.lua | |
parent | dee8f7fde4d5e23c0139c2a7bc2871929c0df246 (diff) | |
parent | ad7e3d7233cff3e34c11323ff5ec64aacb8f678c (diff) | |
download | prosody-19e5326754d02e3a35e14bbbf25ff1c8fed1098d.tar.gz prosody-19e5326754d02e3a35e14bbbf25ff1c8fed1098d.zip |
Merge 0.10->trunk
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 198e208a..92372ac3 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -37,7 +37,7 @@ local _G = _G; module "modulemanager" -local api = _G.require "core.moduleapi"(_M); -- Module API container +local api = _G.require "core.moduleapi".init(_M); -- Module API container -- [host] = { [module] = module_env } local modulemap = { ["*"] = {} }; |