Commit 31288d5c authored by Antoine Le Morvan's avatar Antoine Le Morvan
Browse files

Merge branch 'master' into 'develop'

# Conflicts:
#   supplemental-ui/partials/header-content.hbs
parents 092fc2da d9c3fcf2
Pipeline #160660 passed with stage
in 47 seconds
Supports Markdown
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