From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Thu, 26 May 2016 14:13:27 +0000 (+0200)
Subject: Merge branch 'feature/SPD-1115-alias' into 'master'
X-Git-Tag: v0.1.0~4790
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=b0944a926c86fda55332fd7edcbea5c67612534a;p=pixelpark%2Fhiera.git

Merge branch 'feature/SPD-1115-alias' into 'master'

feature/SPD-1115-alias

https://jira.pixelpark.com/jira/browse/SPD-1115

See merge request !22
---

b0944a926c86fda55332fd7edcbea5c67612534a