From: Thomas Heller <thomas.heller@publicispixelpark.de>
Date: Mon, 16 Jan 2017 15:00:14 +0000 (+0100)
Subject: Merge branch 'patch-19' into 'master'
X-Git-Tag: v0.1.0~3605^2~4
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6ab46ae89734e931171a128ba202afa1bcaa52b8;p=pixelpark%2Fhiera.git

Merge branch 'patch-19' into 'master'

Nicer doc-root for dev.

See merge request !109
---

6ab46ae89734e931171a128ba202afa1bcaa52b8