From: Stadly Date: Fri, 2 Dec 2016 10:21:15 +0000 (+0100) Subject: Merge remote-tracking branch 'refs/remotes/origin/develop' into zurb/develop X-Git-Tag: v2.3.0~7^2~37^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F584%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-emails.git Merge remote-tracking branch 'refs/remotes/origin/develop' into zurb/develop --- 70b45041d07a54b9710c2003e9baaeaff0a2a4fe