From: Nicolas Coden <nicolas@ncoden.fr>
Date: Thu, 15 Nov 2018 22:17:47 +0000 (+0100)
Subject: Merge branch 'master-v6.5' into develop-v6.5
X-Git-Tag: v6.5.2^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78fc3784b99e91d24abcd6e287b46f8a42922eed;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'master-v6.5' into develop-v6.5
---

78fc3784b99e91d24abcd6e287b46f8a42922eed