From: Arne Fitzenreiter Date: Fri, 14 Jun 2024 05:29:22 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into next X-Git-Tag: v2.29-core187~128 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad37110f6ee24d5035d12c49f53b65b90fb3c921;p=ipfire-2.x.git Merge remote-tracking branch 'origin/master' into next --- ad37110f6ee24d5035d12c49f53b65b90fb3c921 diff --cc config/rootfiles/oldcore/186/filelists/openssl index 0000000000,e011a9266c..e011a9266c mode 000000,120000..120000 --- a/config/rootfiles/oldcore/186/filelists/openssl +++ b/config/rootfiles/oldcore/186/filelists/openssl