From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 25 Jun 2020 15:59:39 +0000 (+0200)
Subject: Merge branch 'dev-centos7' into develop
X-Git-Tag: 2.1.2^2~7^2~5
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=027089fadb5da4c1ac887cdcd40629ea9bbd13d7;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'dev-centos7' into develop
---

027089fadb5da4c1ac887cdcd40629ea9bbd13d7