]> git.ipfire.org Git - people/mlorenz/ipfire-2.x.git/commitdiff
projects / people / mlorenz / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2b364f 92e828b)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch-to...
authorStefan Schantl <stefan.schantl@ipfire.org>
Wed, 10 Jun 2020 16:01:14 +0000 (18:01 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Wed, 10 Jun 2020 16:01:14 +0000 (18:01 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
Marcel's tree of IPFire 2.x