Merge 0.11->trunk
authorKim Alvefur <zash@zash.se>
Tue, 23 Jun 2020 15:17:35 +0200
changeset 10952 bebb384090b0
parent 10950 84441c19750e (current diff)
parent 10951 801b9d5957a6 (diff)
child 10953 8b5b35baf370
Merge 0.11->trunk
util/startup.lua
--- 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();