]> 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: d68f875 8b43965)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 28 Jan 2022 14:49:50 +0000 (14:49 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 28 Jan 2022 14:49:50 +0000 (14:49 +0000)

Trivial merge
Peter's tree of IPFire 2.x