From: Nicolas Coden <nicolas@ncoden.fr>
Date: Wed, 21 Feb 2018 15:43:35 +0000 (+0100)
Subject: Merge branch 'develop' into develop
X-Git-Tag: v6.6.0~3^2~292^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10960%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into develop
---

71b11e70638b803f1e5b95477e5b02c9697c6b87