]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
projects / people / stevee / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a0b401 da4ff2f)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into replace-oinkmaster
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 20 Mar 2022 15:12:18 +0000 (16:12 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 20 Mar 2022 15:12:18 +0000 (16:12 +0100)

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