Merge branch 'master' of git.pixelpark.com:puppet/hiera

author Andreas Gerstenberg <gerstenberg@pixelpark.com>

Wed, 25 Apr 2018 11:41:01 +0000 (13:41 +0200)

committer Andreas Gerstenberg <gerstenberg@pixelpark.com>

Wed, 25 Apr 2018 11:41:01 +0000 (13:41 +0200)
author Andreas Gerstenberg <gerstenberg@pixelpark.com>
Wed, 25 Apr 2018 11:41:01 +0000 (13:41 +0200)
committer Andreas Gerstenberg <gerstenberg@pixelpark.com>
Wed, 25 Apr 2018 11:41:01 +0000 (13:41 +0200)
diff --cc customer/spk-alltag/dev-www-alltag-spk-de.pixelpark.net.yaml
Simple merge
diff --cc customer/spk-alltag/www-alltag-spk-de.pixelpark.net.yaml
Simple merge
author	Andreas Gerstenberg <gerstenberg@pixelpark.com>
	Wed, 25 Apr 2018 11:41:01 +0000 (13:41 +0200)
committer	Andreas Gerstenberg <gerstenberg@pixelpark.com>
	Wed, 25 Apr 2018 11:41:01 +0000 (13:41 +0200)
		1	2
customer/spk-alltag/dev-www-alltag-spk-de.pixelpark.net.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
customer/spk-alltag/www-alltag-spk-de.pixelpark.net.yaml	patch \|	diff1 \|	diff2 \|	blob \| history