diff options
| author | Kim Alvefur <zash@zash.se> | 2020-06-23 15:17:35 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-06-23 15:17:35 +0200 |
| commit | bd8cd13d2a6139abcd586f995f666ecf20406e0f (patch) | |
| tree | f9636ba7b7fa26be67211e5ac36db42331b9324d /util | |
| parent | e2a48d60bba1c3444d2e6d8186dc7f90d2b0e416 (diff) | |
| parent | ec6ad23e4f32ed67b336cf7260d521f0ec1990df (diff) | |
| download | prosody-bd8cd13d2a6139abcd586f995f666ecf20406e0f.tar.gz prosody-bd8cd13d2a6139abcd586f995f666ecf20406e0f.zip | |
Merge 0.11->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/startup.lua | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/util/startup.lua b/util/startup.lua index 0e14395b..01ca585b 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -604,7 +604,6 @@ function startup.prosody() startup.sandbox_require(); startup.set_function_metatable(); startup.check_dependencies(); - startup.init_logging(); startup.load_libraries(); startup.setup_plugindir(); -- startup.setup_plugin_install_path(); |