Merge remote-tracking branch 'origin/master' into next

author Arne Fitzenreiter <arne_f@ipfire.org>

Fri, 14 Jun 2024 05:29:22 +0000 (07:29 +0200)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Fri, 14 Jun 2024 05:29:22 +0000 (07:29 +0200)
author Arne Fitzenreiter <arne_f@ipfire.org>
Fri, 14 Jun 2024 05:29:22 +0000 (07:29 +0200)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Fri, 14 Jun 2024 05:29:22 +0000 (07:29 +0200)
diff --cc config/rootfiles/oldcore/186/filelists/files
Simple merge
diff --cc config/rootfiles/oldcore/186/filelists/openssl

index 0000000000000000000000000000000000000000,e011a9266c09e858188459a686e9f48134914866..e011a9266c09e858188459a686e9f48134914866

mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/186/filelists/openssl
+++ b/config/rootfiles/oldcore/186/filelists/openssl
diff --cc config/rootfiles/oldcore/186/update.sh
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Fri, 14 Jun 2024 05:29:22 +0000 (07:29 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Fri, 14 Jun 2024 05:29:22 +0000 (07:29 +0200)
		1	2
config/rootfiles/oldcore/186/filelists/files	patch \|	diff1 \|	diff2 \|	blob \| history
config/rootfiles/oldcore/186/filelists/openssl	patch \|	\|	diff2 \|	blob \| history
config/rootfiles/oldcore/186/update.sh	patch \|	diff1 \|	diff2 \|	blob \| history