From: Samuel Bufe <samuel.bufe@publicispixelpark.de>
Date: Thu, 21 Sep 2017 09:42:17 +0000 (+0200)
Subject: Merge branch 'revert-da21f968' into 'master'
X-Git-Tag: v0.1.0~2473^2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6d99b96b34e0553d0fc1419d1b2dbd0dd73ef8d7;p=pixelpark%2Fhiera.git

Merge branch 'revert-da21f968' into 'master'

Revert "Merge branch 'sirona-prod-deployment-1.18' into 'master'"

See merge request !211
---

6d99b96b34e0553d0fc1419d1b2dbd0dd73ef8d7