From: Michael Krause <michael.krause@publicispixelpark.de>
Date: Fri, 22 Jun 2018 15:46:05 +0000 (+0200)
Subject: Merge branch 'develop' into 'master'
X-Git-Tag: v0.1.0~746
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=b2c73f852c2344a39382e5d90f825b3cc9696822;p=pixelpark%2Fhiera.git

Merge branch 'develop' into 'master'

GRIDPARK-5319 fischerwerke hinzugefügt

See merge request puppet/hiera!224
---

b2c73f852c2344a39382e5d90f825b3cc9696822