From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Tue, 18 Aug 2020 05:03:36 +0000 (+0200)
Subject: Merge branch 'develop' into test
X-Git-Tag: 2.1.2^2~1
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=f572bca750cc595ed1b36d3ce84a4bc0f5cb3272;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'develop' into test
---

f572bca750cc595ed1b36d3ce84a4bc0f5cb3272