From: Daniel Ruf <mac1@daniel-ruf.de>
Date: Sat, 28 Mar 2020 11:37:05 +0000 (+0100)
Subject: Merge branch 'develop' into HEAD
X-Git-Tag: v6.6.3^2~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11994%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into HEAD
---

864f68303451240fba6d6e9f2508050d594fc0f4