aboutsummaryrefslogtreecommitdiffstats
path: root/core/modulemanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-06 01:14:32 +0100
committerKim Alvefur <zash@zash.se>2017-03-06 01:14:32 +0100
commitca65f0d2d3718301b880c0260c991cd8ee7977ae (patch)
treee58db2bf464bf09301a9c02c27330c2dba6b926d /core/modulemanager.lua
parentb133b78d47ff180110b0b29612d3cd257a9972c1 (diff)
parente45c5961ac42007aa6c9282afddff91cd1e27124 (diff)
downloadprosody-ca65f0d2d3718301b880c0260c991cd8ee7977ae.tar.gz
prosody-ca65f0d2d3718301b880c0260c991cd8ee7977ae.zip
Merge 0.10->trunk
Diffstat (limited to 'core/modulemanager.lua')
-rw-r--r--core/modulemanager.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 7bed1795..771f6fb1 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -39,7 +39,8 @@ local _G = _G;
local _ENV = nil;
-local load_modules_for_host, load, unload, reload, get_module, get_items, get_modules, is_loaded, module_has_method, call_module_method;
+local load_modules_for_host, load, unload, reload, get_module, get_items;
+local get_modules, is_loaded, module_has_method, call_module_method;
-- [host] = { [module] = module_env }
local modulemap = { ["*"] = {} };