Merge remote-tracking branch 'origin/next'

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

Tue, 27 Oct 2020 11:46:16 +0000 (11:46 +0000)

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

Tue, 27 Oct 2020 11:46:16 +0000 (11:46 +0000)
author Michael Tremer <michael.tremer@ipfire.org>
Tue, 27 Oct 2020 11:46:16 +0000 (11:46 +0000)
committer Michael Tremer <michael.tremer@ipfire.org>
Tue, 27 Oct 2020 11:46:16 +0000 (11:46 +0000)
diff --cc config/rootfiles/core/152/exclude
Simple merge
diff --cc config/rootfiles/core/152/filelists/libloc

index ff4a92429cb2937f76a27003ed1fe1ee80479bbc,0000000000000000000000000000000000000000..ff4a92429cb2937f76a27003ed1fe1ee80479bbc

mode 120000,000000..120000
--- 1/config/rootfiles/core/151/filelists/libloc
--- /dev/null
+++ b/config/rootfiles/core/152/filelists/libloc
author	Michael Tremer <michael.tremer@ipfire.org>
	Tue, 27 Oct 2020 11:46:16 +0000 (11:46 +0000)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Tue, 27 Oct 2020 11:46:16 +0000 (11:46 +0000)
		1	2
config/rootfiles/core/152/exclude	patch \|	diff1 \|	diff2 \|	blob \| history
config/rootfiles/core/152/filelists/libloc	patch \|	diff1 \|	\|	blob \| history