]> git.ipfire.org Git - ipfire.org.git/commitdiff
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 22 Jun 2019 09:09:29 +0000 (10:09 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 22 Jun 2019 09:09:29 +0000 (10:09 +0100)

Trivial merge