]> 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: 510d3f0 92a5ad8)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <stefan.schantl@ipfire.org>
Tue, 6 Jul 2021 16:04:55 +0000 (18:04 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Tue, 6 Jul 2021 16:04:55 +0000 (18:04 +0200)

Trivial merge
Peter's tree of IPFire 2.x