Merge remote-tracking branch 'origin/master' into defer-wip

author Lukáš Ondráček <lukas.ondracek@nic.cz>

Wed, 4 Dec 2024 16:31:36 +0000 (17:31 +0100)

committer Vladimír Čunát <vladimir.cunat@nic.cz>

Wed, 11 Dec 2024 13:20:16 +0000 (14:20 +0100)
author Lukáš Ondráček <lukas.ondracek@nic.cz>
Wed, 4 Dec 2024 16:31:36 +0000 (17:31 +0100)
committer Vladimír Čunát <vladimir.cunat@nic.cz>
Wed, 11 Dec 2024 13:20:16 +0000 (14:20 +0100)
diff --cc daemon/main.c
Simple merge
diff --cc daemon/worker.c
Simple merge
diff --cc doc/_static/config.schema.json
Simple merge
diff --cc python/knot_resolver/manager/manager.py
Simple merge
author	Lukáš Ondráček <lukas.ondracek@nic.cz>
	Wed, 4 Dec 2024 16:31:36 +0000 (17:31 +0100)
committer	Vladimír Čunát <vladimir.cunat@nic.cz>
	Wed, 11 Dec 2024 13:20:16 +0000 (14:20 +0100)
		1	2
daemon/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
daemon/worker.c	patch \|	diff1 \|	diff2 \|	blob \| history
doc/_static/config.schema.json	patch \|	diff1 \|	diff2 \|	blob \| history
python/knot_resolver/manager/manager.py	patch \|	diff1 \|	diff2 \|	blob \| history