diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-11-02 07:17:26 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-11-02 07:17:26 +0000 |
| commit | 0d104175eae496d612391f0aafc28fd0ba20c5f9 (patch) | |
| tree | bcb788812b22466058e556eb3728670991458b01 /prosody | |
| parent | cea60b7a5d8f81f2515bd273279141d9925728f1 (diff) | |
| parent | 464f525c81423ff7b8d6814fceeb0657b8cbcc29 (diff) | |
| download | prosody-0d104175eae496d612391f0aafc28fd0ba20c5f9.tar.gz prosody-0d104175eae496d612391f0aafc28fd0ba20c5f9.zip | |
Merge with Zash
Diffstat (limited to 'prosody')
| -rwxr-xr-x | prosody | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -203,7 +203,7 @@ function init_global_state() -- path1;path2;path3;defaultpath... CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins"); end - prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, + prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR or ".", plugins = CFG_PLUGINDIR or "plugins", data = data_path }; prosody.arg = _G.arg; |