Commit 18f8fd07 authored by Thomas Löffler's avatar Thomas Löffler

Merge branch 'develop' into assets

parents 36a7d97b 6907779e
Pipeline #8098 passed with stages
in 6 minutes and 29 seconds