From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Wed, 7 Jun 2017 13:35:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/stetesch_yamlfix'
X-Git-Tag: v0.1.0~2846
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f9b963cf74b80d74c505d1a500879df334d08af6;p=pixelpark%2Fhiera.git

Merge remote-tracking branch 'origin/stetesch_yamlfix'
---

f9b963cf74b80d74c505d1a500879df334d08af6