]> 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>
Mon, 3 Feb 2020 12:19:45 +0000 (12:19 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Feb 2020 12:19:45 +0000 (12:19 +0000)

Trivial merge