From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Fri, 5 May 2017 09:12:59 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.1.2~174
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=a2ebd9a6fdb34128361cebe273b945bea8631a03;p=pixelpark%2Fadmin-tools.git

Merge branch 'master' into develop
---

a2ebd9a6fdb34128361cebe273b945bea8631a03