Commit 684496d2 authored by Fabien FORESTIER's avatar Fabien FORESTIER
Browse files

Merge branch 'master' into 'development'

# Conflicts:
#   .gitlab-ci.yml
parents 099f4ed8 2960a68d
Pipeline #3216 passed with stages
in 55 seconds