]> 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: 93b0b7a fbbf44c)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 7 Feb 2021 13:46:17 +0000 (13:46 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 7 Feb 2021 13:46:17 +0000 (13:46 +0000)

Trivial merge
Peter's tree of IPFire 2.x