From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 6 Nov 2017 08:25:11 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.1.2~124
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=eb7ebcac6a3a99879b6fbdaad81e9327b04eb86f;p=pixelpark%2Fadmin-tools.git

Merge branch 'master' into develop
---

eb7ebcac6a3a99879b6fbdaad81e9327b04eb86f