Skip to content
Commit adeff820 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' into 'gitlab-junit' 

# Conflicts:
#   .gitlab-ci.yml
parents 748c6fb0 e1190385