From: Hannes Eichblatt <hannes.eichblatt@publicispixelpark.de>
Date: Fri, 16 Jun 2017 12:00:20 +0000 (+0200)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: v0.1.0~2801^2~29^2~11
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d3514434a7af70f2530a4b92c634845c267bb9c5;p=pixelpark%2Fhiera.git

Merge branch 'master' into 'master'

GRIDPARK-4875

See merge request !184
---

d3514434a7af70f2530a4b92c634845c267bb9c5