Skip to content
Snippets Groups Projects
Commit caecad18 authored by Gervaise Henry's avatar Gervaise Henry :cowboy:
Browse files

Merge branch 'develop' into 'master' 

Develop

See merge request !57
parents 4b102a5e bedc0841
2 merge requests!64Master,!57Develop
Pipeline #4732 passed with stages
in 10 minutes and 54 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 738 additions and 102 deletions
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