Skip to content
Snippets Groups Projects
Commit fa3ed5d2 authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

Merge branch 'master' into 'develop'

# Conflicts:
#   .gitlab-ci.yml
parents edb01130 e814ef59
No related branches found
No related tags found
1 merge request!18Develop
Pipeline #52651 passed