Commit 79e7e50b authored by Matthieu Boileau's avatar Matthieu Boileau

Merge branch 'master' into 'develop'

# Conflicts:
parents 671bcfe5 d289dba4
Pipeline #7643 passed with stage
in 1 minute and 56 seconds
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment