From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 27 Oct 2020 11:46:16 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=201ad7ff80eb8870aab2b903be6eb7aea2adf563

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

201ad7ff80eb8870aab2b903be6eb7aea2adf563
diff --cc config/rootfiles/core/152/filelists/libloc
index ff4a92429c,0000000000..ff4a92429c
mode 120000,000000..120000
--- a/config/rootfiles/core/152/filelists/libloc
+++ b/config/rootfiles/core/152/filelists/libloc