From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 29 Jun 2020 15:40:55 +0000 (+0200)
Subject: Merge branch 'develop' into test
X-Git-Tag: 2.1.2^2~5
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=6317a197fbfe3c37eb143fa60deb9dea1567bde3;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'develop' into test
---

6317a197fbfe3c37eb143fa60deb9dea1567bde3