From: Peter Müller Date: Mon, 18 Apr 2022 16:38:47 +0000 (+0000) Subject: Merge branch 'next' into temp-c168-development X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c74f7aa6d94337fec1d83e10e6d63c90b3d7aa72 Merge branch 'next' into temp-c168-development --- c74f7aa6d94337fec1d83e10e6d63c90b3d7aa72 diff --cc config/rootfiles/oldcore/167/filelists/elinks index 0000000000,10db4dd8f7..10db4dd8f7 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/167/filelists/elinks +++ b/config/rootfiles/oldcore/167/filelists/elinks diff --cc config/rootfiles/oldcore/167/filelists/libloc index 0000000000,ff4a92429c..ff4a92429c mode 000000,120000..120000 --- a/config/rootfiles/oldcore/167/filelists/libloc +++ b/config/rootfiles/oldcore/167/filelists/libloc diff --cc config/rootfiles/oldcore/167/filelists/vnstat index 0000000000,2e2e6100bf..2e2e6100bf mode 000000,120000..120000 --- a/config/rootfiles/oldcore/167/filelists/vnstat +++ b/config/rootfiles/oldcore/167/filelists/vnstat diff --cc config/rootfiles/oldcore/167/filelists/xz index 0000000000,734e926c7e..734e926c7e mode 000000,120000..120000 --- a/config/rootfiles/oldcore/167/filelists/xz +++ b/config/rootfiles/oldcore/167/filelists/xz