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 | a4b456c8577e5188da086ce16738ed019351ee1f (patch) | |
| tree | d9a05404bdeb962960f8fc96ebdae4c569d318c5 /tools | |
| parent | mod_s2s: Follow XMPP Core on when a stream is to be considered ready (diff) | |
| parent | util.dataforms: Add support for XEP-0221: Data Forms Media Element (diff) | |
| download | prosody-a4b456c8577e5188da086ce16738ed019351ee1f.tar.xz prosody-a4b456c8577e5188da086ce16738ed019351ee1f.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 03376b30e..e43dc2960 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 |