]> 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: 8f696f6 855b46d)
Merge branch 'next'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Apr 2022 15:56:39 +0000 (15:56 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Apr 2022 15:56:39 +0000 (15:56 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

Trivial merge
Peter's tree of IPFire 2.x