Commit 948d9798 authored by Antoine Le Morvan's avatar Antoine Le Morvan
Browse files

Merge branch 'master' into 'develop'

# Conflicts:
#   package.json
parents 55a83351 657deb0d
Pipeline #201022 failed with stage
in 12 seconds