Merge branch 'master' into next

author Arne Fitzenreiter <arne_f@ipfire.org>

Tue, 23 Jul 2024 19:59:26 +0000 (21:59 +0200)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Tue, 23 Jul 2024 19:59:26 +0000 (21:59 +0200)
author Arne Fitzenreiter <arne_f@ipfire.org>
Tue, 23 Jul 2024 19:59:26 +0000 (21:59 +0200)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Tue, 23 Jul 2024 19:59:26 +0000 (21:59 +0200)
diff --cc config/rootfiles/oldcore/187/filelists/files
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Tue, 23 Jul 2024 19:59:26 +0000 (21:59 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Tue, 23 Jul 2024 19:59:26 +0000 (21:59 +0200)