]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d435f08 ae61c74)
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 patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/core/124/update.sh
Simple merge
Peter's tree of IPFire 2.x