Merge branch 'core124' of git.ipfire.org:/pub/git/ipfire-2.x into core124
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 28 Sep 2018 16:43:15 +0000 (18:43 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 28 Sep 2018 16:43:15 +0000 (18:43 +0200)
1  2 
config/rootfiles/core/124/update.sh

Simple merge