Commit f697c4d5 authored by Thomas Löffler's avatar Thomas Löffler

Merge branch 'develop' into 'change-to-stage-server'

# Conflicts:
#   .gitlab-ci.yml
parents 93c74ed1 c3e24344
Pipeline #1046 passed with stages
in 4 minutes and 14 seconds