From: Oliver Böttcher <oliver.boettcher@publicispixelpark.de>
Date: Thu, 11 Aug 2016 11:25:15 +0000 (+0200)
Subject: Merge branch 'patch-2' into 'master'
X-Git-Tag: v0.1.0~4325
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=70afda7265d9f5fdbfcc934943e807668fb19ade;p=pixelpark%2Fhiera.git

Merge branch 'patch-2' into 'master'

Update dev-web01-meine-krankenkasse-de.pixelpark.net.yaml, set environment to development



See merge request !56
---

70afda7265d9f5fdbfcc934943e807668fb19ade