Software /
code /
prosody
Diff
util/startup.lua @ 10948:bebb384090b0
Merge 0.11->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Tue, 23 Jun 2020 15:17:35 +0200 |
parent | 10936:d770435f0f84 |
parent | 10947:801b9d5957a6 |
child | 11050:51be24b16e8a |
line wrap: on
line diff
--- a/util/startup.lua Mon Jun 22 11:35:24 2020 +0100 +++ b/util/startup.lua Tue Jun 23 15:17:35 2020 +0200 @@ -604,7 +604,6 @@ startup.sandbox_require(); startup.set_function_metatable(); startup.check_dependencies(); - startup.init_logging(); startup.load_libraries(); startup.setup_plugindir(); -- startup.setup_plugin_install_path();