]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'patch-25' into 'master'
authorPhilipp Dallig <philipp.dallig@publicispixelpark.de>
Wed, 29 Mar 2017 11:21:05 +0000 (13:21 +0200)
committerPhilipp Dallig <philipp.dallig@publicispixelpark.de>
Wed, 29 Mar 2017 11:21:05 +0000 (13:21 +0200)
set X-Frame-Options: SAMEORIGIN at dev-pfizer-dtd-preview.pixelpark.net

See merge request !142


Trivial merge