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

Merge branch 'dev-oel7' into develop
---

3f70d70f09ffa8b9231ec7535f7ba737c7b95982