From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Fri, 26 Jun 2020 13:38:35 +0000 (+0200)
Subject: Merge branch 'develop' into test
X-Git-Tag: 2.1.2^2~7
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=2288522a2bbf44eef9be0dcf47d7b1625862bf8d;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'develop' into test
---

2288522a2bbf44eef9be0dcf47d7b1625862bf8d