From: Yanik Crépeau <ycrepeau@me.com>
Date: Mon, 31 May 2021 19:22:44 +0000 (-0400)
Subject: Merge branch 'foundation:develop' into develop
X-Git-Tag: v6.7.1~32^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F12195%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'foundation:develop' into develop
---

b3c62f8a7eae77bcf530bc29c76f220f2791d71c