]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
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)
commitfcd8ab4c236d434e655866c3aa3cf90c8eefc110
tree84f8a038fffa4ef41e7a3f514e6d8e4a74d8d79b
parent6c6c1e3f043b7c4e99fabb6e92fce226089392af
parentbee416e2829a5063819ee97f299482e4f894e9e5
Merge branch 'master' into core115
config/extrahd/extrahd.pl
config/rootfiles/oldcore/114/filelists/files