From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 7 Jul 2022 15:18:30 +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=817a258c0a75f5e56e2370f9d74a74f0813e1ab4;p=people%2Fstevee%2Fipfire-2.x.git

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

817a258c0a75f5e56e2370f9d74a74f0813e1ab4