Software / code / prosody
Diff
core/modulemanager.lua @ 6423:1c78f10f05d0
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 23 Sep 2014 01:44:16 +0200 |
| parent | 6422:6d4d87a89026 |
| child | 6660:30672cc3d8ee |
line wrap: on
line diff
--- a/core/modulemanager.lua Tue Sep 16 17:11:29 2014 -0400 +++ b/core/modulemanager.lua Tue Sep 23 01:44:16 2014 +0200 @@ -37,7 +37,7 @@ 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 = { ["*"] = {} };
