From: Arne Fitzenreiter Date: Wed, 8 Jan 2025 05:36:20 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into next X-Git-Tag: v2.29-core192~158 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99790b2a1c30a06c7bb91fb9ba364828eb20638f;p=ipfire-2.x.git Merge remote-tracking branch 'origin/master' into next Signed-off-by: Arne Fitzenreiter --- 99790b2a1c30a06c7bb91fb9ba364828eb20638f diff --cc config/rootfiles/oldcore/191/filelists/dhcpcd index 0000000000,1e799dabb4..1e799dabb4 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/191/filelists/dhcpcd +++ b/config/rootfiles/oldcore/191/filelists/dhcpcd diff --cc config/rootfiles/oldcore/191/filelists/squid index 0000000000,2dc8372a0e..2dc8372a0e mode 000000,120000..120000 --- a/config/rootfiles/oldcore/191/filelists/squid +++ b/config/rootfiles/oldcore/191/filelists/squid