]> 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: b954ae2 c4f1f56)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 16 Dec 2020 10:33:36 +0000 (10:33 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 16 Dec 2020 10:33:36 +0000 (10:33 +0000)

Trivial merge
Peter's tree of IPFire 2.x