Software / code / prosody
Changeset
5164:12f5a3438090
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 29 Sep 2012 17:07:50 +0100 |
| parents | 5162:cda4d3f01ddd (current diff) 5163:854f6d9aee2d (diff) |
| children | 5166:72cdc2d4e15e |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/moduleapi.lua Sat Sep 29 10:47:37 2012 +0100 +++ b/core/moduleapi.lua Sat Sep 29 17:07:50 2012 +0100 @@ -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";
