]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Merge branch 'master' into core115
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 18 Oct 2017 19:20:23 +0000 (21:20 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 18 Oct 2017 19:20:23 +0000 (21:20 +0200)
1  2 
config/extrahd/extrahd.pl
config/rootfiles/oldcore/114/filelists/files

Simple merge