]> 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: 0e683e6 4b9b852)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Thu, 23 Jun 2022 06:00:41 +0000 (08:00 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Thu, 23 Jun 2022 06:00:41 +0000 (08:00 +0200)

Trivial merge
Peter's tree of IPFire 2.x