Commit 641e561a authored by Benjamin Larsson's avatar Benjamin Larsson
Browse files

Merge branch 'master' into 'devel'

# Conflicts:
#   .gitlab-ci.yml
parents e735e77c 9c9d94b6
Pipeline #994 passed with stage
in 1 minute and 4 seconds