From: Arne Fitzenreiter Date: Wed, 29 Aug 2018 05:43:06 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: v2.21-core124~42 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=fd313a1ae690ce95d91802fea0d94d85da084fd8 Merge branch 'master' into next --- fd313a1ae690ce95d91802fea0d94d85da084fd8 diff --cc config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 index 0000000000,f424713d6c..f424713d6c mode 000000,120000..120000 --- a/config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 +++ b/config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 diff --cc config/rootfiles/oldcore/123/filelists/xtables-addons index 0000000000,2e24c4298b..2e24c4298b mode 000000,120000..120000 --- a/config/rootfiles/oldcore/123/filelists/xtables-addons +++ b/config/rootfiles/oldcore/123/filelists/xtables-addons