From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 22 Jun 2020 12:40:50 +0000 (+0200)
Subject: Merge branch 'dev-el8' of git.pixelpark.com:ppadmin/create-vmware-tpl into dev-el8
X-Git-Tag: 2.1.2^2~9^2~31^2~17
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=49c7372ea4b7f8e201a2998f16c5857f17d50ab1;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'dev-el8' of git.pixelpark.com:ppadmin/create-vmware-tpl into dev-el8
---

49c7372ea4b7f8e201a2998f16c5857f17d50ab1