]> 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: 31cbb58 e1253a4)
Merge branch 'next' into master
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 3 Dec 2020 12:55:36 +0000 (12:55 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 3 Dec 2020 12:56:02 +0000 (12:56 +0000)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

Trivial merge
Peter's tree of IPFire 2.x