From: Philipp Dallig <philipp.dallig@publicispixelpark.de>
Date: Tue, 25 Oct 2016 08:41:39 +0000 (+0200)
Subject: Merge branch 'patch-13' into 'master'
X-Git-Tag: v0.1.0~3911
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=e3d1963d9272bbf1b33ac3ab368ec77c2e227f7d;p=pixelpark%2Fhiera.git

Merge branch 'patch-13' into 'master'

Pfizer Sab-Simplex: Update Express proxy doc-root

Hier das merge request zur Anpassung des Sab-Simplex Doc-root.

See merge request !82
---

e3d1963d9272bbf1b33ac3ab368ec77c2e227f7d