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

Merge branch 'revert-6d99b96b' into 'master'

Revert "Merge branch 'revert-da21f968' into 'master'"

See merge request !212
---

54e3138e776f598b6e45e96ae2f022b4247d0901