]> git.ipfire.org Git - ipfire.org.git/commitdiff
Merge branch 'master' )of ssh://people.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 10 Dec 2019 14:18:02 +0000 (14:18 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 10 Dec 2019 14:18:02 +0000 (14:18 +0000)

Trivial merge