From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 21 Jun 2022 07:41:45 +0000 (+0200)
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=804a3065870a325d29bfedee877fa3fb3e779f7e;p=people%2Fstevee%2Fipfire-2.x.git

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

804a3065870a325d29bfedee877fa3fb3e779f7e