Merge branch 'master' into develop

This commit is contained in:
Björn Fromme
2019-10-25 10:42:59 +02:00
@@ -25,9 +25,9 @@
{product.programmeDescription -> f:format.html()}
</div>
</f:if>
<f:if condition="{product.skipassDescription}">
<f:if condition="{product.skiPassDescription}">
<div class="ep-headbar">Skipass, Kurse, Leihmaterial</div>
<div class="product-details product-details--skipass">
{product.skipassDescription -> f:format.html()}
{product.skiPassDescription -> f:format.html()}
</div>
</f:if>