Mercurial > prosody-hg

diff plugins/mod_storage_sql2.lua @ 6168:3942630b4e35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 09 May 2014 23:35:54 +0200
parents 6a184b16b717
children bce801e40484
line wrap: on
line diff
--- a/plugins/mod_storage_sql2.lua	Tue May 06 00:37:08 2014 +0200
+++ b/plugins/mod_storage_sql2.lua	Fri May 09 23:35:54 2014 +0200
@@ -2,7 +2,7 @@
 local json = require "util.json";
 local xml_parse = require "util.xml".parse;
 local uuid = require "util.uuid";
-local resolve_relative_path = require "core.configmanager".resolve_relative_path;
+local resolve_relative_path = require "util.paths".resolve_relative_path;
 
 local stanza_mt = require"util.stanza".stanza_mt;
 local getmetatable = getmetatable;