Merge branch 'master' into next

author Arne Fitzenreiter <arne_f@ipfire.org>

Thu, 24 Sep 2020 14:16:16 +0000 (14:16 +0000)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Thu, 24 Sep 2020 14:16:16 +0000 (14:16 +0000)
author Arne Fitzenreiter <arne_f@ipfire.org>
Thu, 24 Sep 2020 14:16:16 +0000 (14:16 +0000)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Thu, 24 Sep 2020 14:16:16 +0000 (14:16 +0000)
diff --cc config/rootfiles/oldcore/149/update.sh
Simple merge
diff --cc make.sh
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Thu, 24 Sep 2020 14:16:16 +0000 (14:16 +0000)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Thu, 24 Sep 2020 14:16:16 +0000 (14:16 +0000)
		1	2
config/rootfiles/oldcore/149/update.sh	patch \|	diff1 \|	diff2 \|	blob \| history
make.sh	patch \|	diff1 \|	diff2 \|	blob \| history