]> Frank Brehm's Git Trees - pixelpark/create-vmware-tpl.git/commit
Merge branch 'master' into develop
authorFrank Brehm <frank.brehm@pixelpark.com>
Thu, 13 Sep 2018 13:43:00 +0000 (15:43 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Thu, 13 Sep 2018 13:43:00 +0000 (15:43 +0200)
commit656d9772785c269e10e48df60f38b77ad16cc022
tree15166ea2ae0cc67906f11e2a0854e936e6453d92
parentc468610e4e27aa0cacb1a7ae36f398f593786510
parent12add0f2db0f4e5dc05c65d25791dd99a7f8e5d4
Merge branch 'master' into develop

Conflicts:
lib/cr_vmware_tpl/handler.py
lib/cr_vmware_tpl/handler.py