From: Philipp Dallig <philipp.dallig@publicispixelpark.de>
Date: Wed, 29 Mar 2017 11:21:05 +0000 (+0200)
Subject: Merge branch 'patch-25' into 'master'
X-Git-Tag: v0.1.0~3370^2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=e1ca29fb7dc0b6f856c7038292c9a7a184611951;p=pixelpark%2Fhiera.git

Merge branch 'patch-25' into 'master'

set X-Frame-Options: SAMEORIGIN at dev-pfizer-dtd-preview.pixelpark.net

See merge request !142
---

e1ca29fb7dc0b6f856c7038292c9a7a184611951