# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1666277805 -7200
# Node ID 2c0c1b18a02babfbd955e2b2c49eb7265e21d396
# Parent  6163c8b17ea9723a9550b22774d01c485b997b2a# Parent  f0474d40364ce5762edaefbece38eb64d9a04cf3
Merge 0.12->trunk

diff -r 6163c8b17ea9 -r 2c0c1b18a02b util/startup.lua
--- a/util/startup.lua	Wed Oct 19 14:34:41 2022 +0200
+++ b/util/startup.lua	Thu Oct 20 16:56:45 2022 +0200
@@ -132,6 +132,7 @@
 function startup.load_libraries()
 	-- Load socket framework
 	-- luacheck: ignore 111/server 111/socket
+	require "util.import"
 	socket = require "socket";
 	server = require "net.server"
 end
@@ -359,7 +360,6 @@
 
 function startup.load_secondary_libraries()
 	--- Load and initialise core modules
-	require "util.import"
 	require "util.xmppstream"
 	require "core.stanza_router"
 	require "core.statsmanager"