From: Daniel Ruf <DanielRuf@users.noreply.github.com>
Date: Mon, 26 Feb 2018 23:10:43 +0000 (+0100)
Subject: Merge branch 'develop' into fix/develop-dropdown-eventnames
X-Git-Tag: v6.6.0~3^2~286^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10965%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into fix/develop-dropdown-eventnames
---

380b811ebb28eac10ca87a424360f31d4528ebc0