From: Arne Fitzenreiter Date: Mon, 2 Apr 2018 14:56:02 +0000 (+0200) Subject: Merge branch 'master' into core119 X-Git-Tag: v2.19-core120~7 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=718119b897ed3a758745f0b59d078dded485a5e0 Merge branch 'master' into core119 --- 718119b897ed3a758745f0b59d078dded485a5e0 diff --cc config/rootfiles/core/120/filelists/files index 8648cfccb1,d98e3a9180..c029cd4308 --- a/config/rootfiles/core/120/filelists/files +++ b/config/rootfiles/core/120/filelists/files @@@ -7,8 -7,8 +7,9 @@@ etc/rc.d/init.d/pakfir etc/rc.d/init.d/unbound etc/rc.d/rcsysinit.d/S81pakfire opt/pakfire/lib/functions.pl +opt/pakfire/pakfire - opt/pakfire/pakfire.key + opt/pakfire/pakfire-2007.key + opt/pakfire/pakfire-2018.key srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/qos.cgi