diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-09-29 17:07:50 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-09-29 17:07:50 +0100 |
| commit | f668985503c28905145fc31475e935e175ab2ad7 (patch) | |
| tree | e37df475ed84a1b8d0b6c5ca95fc9812235ae905 /core | |
| parent | 8938f3e59ace1b8c5c7908c1bf0e412a295bdd6e (diff) | |
| parent | 54544179a10c4967dc55e6301b92ae0b217926ef (diff) | |
| download | prosody-f668985503c28905145fc31475e935e175ab2ad7.tar.gz prosody-f668985503c28905145fc31475e935e175ab2ad7.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/moduleapi.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua index a6bfbd0f..20898fcf 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -7,7 +7,7 @@ -- local config = require "core.configmanager"; -local modulemanager = require "core.modulemanager"; +local modulemanager = require "modulemanager"; -- This is necessary to avoid require loops local array = require "util.array"; local set = require "util.set"; local logger = require "util.logger"; |