diff options
author | Kim Alvefur <zash@zash.se> | 2014-04-23 00:22:36 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-04-23 00:22:36 +0200 |
commit | 6316aef5bb993b6d3c6d21d6a4068a540f8c816c (patch) | |
tree | d9a05404bdeb962960f8fc96ebdae4c569d318c5 /tools | |
parent | c0b1478433efe4ea22fe3e792770136b833f231a (diff) | |
parent | e02bb3f3073423bed59f322907d186d75372bc0d (diff) | |
download | prosody-6316aef5bb993b6d3c6d21d6a4068a540f8c816c.tar.gz prosody-6316aef5bb993b6d3c6d21d6a4068a540f8c816c.zip |
Merge 0.9->0.10
Diffstat (limited to 'tools')
-rw-r--r-- | tools/jabberd14sql2prosody.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/jabberd14sql2prosody.lua b/tools/jabberd14sql2prosody.lua index 03376b30..e43dc296 100644 --- a/tools/jabberd14sql2prosody.lua +++ b/tools/jabberd14sql2prosody.lua @@ -428,7 +428,7 @@ end end -- import modules -package.path = package.path.."..\?.lua;"; +package.path = package.path..";../?.lua;"; local my_name = arg[0]; if my_name:match("[/\\]") then |