From: Peter Müller Date: Sat, 23 Apr 2022 14:23:04 +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=1f326847a36c80b4c65952d06687bf6819a2d6e8 Merge branch 'next' into temp-c168-development --- 1f326847a36c80b4c65952d06687bf6819a2d6e8 diff --cc config/rootfiles/oldcore/167/filelists/pcmciautils index 0000000000,7cbf8218c5..7cbf8218c5 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/167/filelists/pcmciautils +++ b/config/rootfiles/oldcore/167/filelists/pcmciautils diff --cc config/rootfiles/oldcore/167/filelists/xfsprogs index 0000000000,91032964d5..91032964d5 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/167/filelists/xfsprogs +++ b/config/rootfiles/oldcore/167/filelists/xfsprogs