From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 4 May 2017 16:41:22 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.1.2~175
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a611917732200436a5b1328b5119c4dea63a009a;p=pixelpark%2Fadmin-tools.git

Merge branch 'master' into develop
---

a611917732200436a5b1328b5119c4dea63a009a