]> 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: 2d5b98c 0a48e56)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <stefan.schantl@ipfire.org>
Wed, 30 Jun 2021 18:13:27 +0000 (20:13 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Wed, 30 Jun 2021 18:13:27 +0000 (20:13 +0200)

Trivial merge
Matthias' tree of IPFire 2.x