From: Philipp Dallig <philipp.dallig@publicispixelpark.de>
Date: Wed, 7 Dec 2016 10:17:24 +0000 (+0100)
Subject: Merge branch 'patch-19' into 'master'
X-Git-Tag: v0.1.0~3725^2~78^2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=28906eae52f195f56ebf04527c3024c8c6577d22;p=pixelpark%2Fhiera.git

Merge branch 'patch-19' into 'master'

Update dev-web-ngcc-daimler.pixelpark.net.yaml to allow facebook and youtube scripts in CSP

See merge request !97
---

28906eae52f195f56ebf04527c3024c8c6577d22