From: Philipp Dallig <philipp.dallig@publicispixelpark.de>
Date: Mon, 25 Jul 2016 08:47:53 +0000 (+0200)
Subject: Merge branch 'revert-cbf0bf4e' into 'master'
X-Git-Tag: v0.1.0~4470
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=8ade4a629f808404db7ff9c3cdd6be0efe3f323f;p=pixelpark%2Fhiera.git

Merge branch 'revert-cbf0bf4e' into 'master'

Revert "Merge branch 'feature/sirona-int-deployment-0.11' into 'master'"

This reverts merge request !41

Es kam zu vielen Fehlern.

See merge request !43
---

8ade4a629f808404db7ff9c3cdd6be0efe3f323f