Merge branch 'master' into next

author Michael Tremer <michael.tremer@ipfire.org>

Mon, 7 Oct 2024 10:23:22 +0000 (10:23 +0000)

committer Michael Tremer <michael.tremer@ipfire.org>

Mon, 7 Oct 2024 10:23:22 +0000 (10:23 +0000)
author Michael Tremer <michael.tremer@ipfire.org>
Mon, 7 Oct 2024 10:23:22 +0000 (10:23 +0000)
committer Michael Tremer <michael.tremer@ipfire.org>
Mon, 7 Oct 2024 10:23:22 +0000 (10:23 +0000)
diff --cc config/rootfiles/oldcore/189/filelists/ncat

index 0000000000000000000000000000000000000000,38dcdb22458ac973b270e88a0e08fc2eff3d8d50..38dcdb22458ac973b270e88a0e08fc2eff3d8d50

mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/189/filelists/ncat
+++ b/config/rootfiles/oldcore/189/filelists/ncat
diff --cc config/rootfiles/oldcore/189/update.sh
Simple merge
author	Michael Tremer <michael.tremer@ipfire.org>
	Mon, 7 Oct 2024 10:23:22 +0000 (10:23 +0000)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Mon, 7 Oct 2024 10:23:22 +0000 (10:23 +0000)
		1	2
config/rootfiles/oldcore/189/filelists/ncat	patch \|	\|	diff2 \|	blob \| history
config/rootfiles/oldcore/189/update.sh	patch \|	diff1 \|	diff2 \|	blob \| history