]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
projects / people / ms / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9517c7 06104d4)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-3.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 31 Jul 2021 16:52:02 +0000 (18:52 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 31 Jul 2021 16:52:02 +0000 (18:52 +0200)

Trivial merge
Michael's tree of IPFire 2.x.