From: Sascha Strassheim <sascha.strassheim@publicispixelpark.de>
Date: Mon, 8 Jan 2018 15:18:14 +0000 (+0100)
Subject: Merge branch 'feature/wj2018' into 'master'
X-Git-Tag: v0.1.0~1803^2~7
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=fb2e09ff671d784ec5937ae7ba482bc834f64eca;p=pixelpark%2Fhiera.git

Merge branch 'feature/wj2018' into 'master'

Adding WJ2018

See merge request puppet/hiera!218
---

fb2e09ff671d784ec5937ae7ba482bc834f64eca