]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
projects / people / mfischer / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0bc608 6c8b544)
Merge remote-tracking branch 'origin/master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 17 Jan 2025 09:43:05 +0000 (09:43 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 17 Jan 2025 09:43:05 +0000 (09:43 +0000)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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