From: Thomas Heller <thomas.heller@publicispixelpark.de>
Date: Tue, 25 Oct 2016 09:35:59 +0000 (+0200)
Subject: Merge branch 'patch-12' into 'master'
X-Git-Tag: v0.1.0~3908
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=e8d464c574cda1b01603a3cea3f3c2750b0b5b27;p=pixelpark%2Fhiera.git

Merge branch 'patch-12' into 'master'

Update FE Doc-root paths to match dev server

NKH-40 review

See merge request !81
---

e8d464c574cda1b01603a3cea3f3c2750b0b5b27