From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Wed, 8 Dec 2021 16:03:31 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba154161199f84bb7c80ff6bbebf16e6660af738;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
---

ba154161199f84bb7c80ff6bbebf16e6660af738