diff options
author | Kim Alvefur <zash@zash.se> | 2014-09-18 02:22:48 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-09-18 02:22:48 +0200 |
commit | 31be1596b93612e1c848402bd21207ad06ae30e8 (patch) | |
tree | 361f642064745fd1a6601050e7573062ff65e2ad /core/modulemanager.lua | |
parent | 57b543c70405092fc24f859c05c734fc8b361030 (diff) | |
parent | b19f5a09a19534973d522e7400139f040d76391b (diff) | |
download | prosody-31be1596b93612e1c848402bd21207ad06ae30e8.tar.gz prosody-31be1596b93612e1c848402bd21207ad06ae30e8.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 db4c6bd0..198e208a 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -37,7 +37,7 @@ local _G = _G; module "modulemanager" -local api = _G.require "core.moduleapi"; -- Module API container +local api = _G.require "core.moduleapi"(_M); -- Module API container -- [host] = { [module] = module_env } local modulemap = { ["*"] = {} }; |