Commit 8bce6c8a authored by Benjamin Baer's avatar Benjamin Baer
Browse files

Merge branch 'master' into 'b9329-annotations'

# Conflicts:
#   .gitlab-ci.yml
parents 7316da5c 6c009759
Pipeline #2500 passed with stages
in 2 minutes and 42 seconds