]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae3a88a 131cfcf)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 30 Jul 2021 17:51:43 +0000 (19:51 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 30 Jul 2021 17:51:43 +0000 (19:51 +0200)

Trivial merge
IPFire 2.x development tree