From: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Fri, 1 Jan 2021 09:54:44 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af80df6d03376f2fd4fecaa1218f2c65ddd31ccb;p=people%2Fmfischer%2Fipfire-2.x.git

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

af80df6d03376f2fd4fecaa1218f2c65ddd31ccb