From: Philipp Dallig <philipp.dallig@publicispixelpark.de>
Date: Tue, 4 Apr 2017 07:21:02 +0000 (+0200)
Subject: Merge branch 'patch-27' into 'master'
X-Git-Tag: v0.1.0~3325^2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=96b5436ec3458450003b67902a771a351cfb8f8b;p=pixelpark%2Fhiera.git

Merge branch 'patch-27' into 'master'

Update common.yaml and add key for thaupt

See merge request !149
---

96b5436ec3458450003b67902a771a351cfb8f8b