Skip to content
GitLab
Commit 2319683b authored by Lauriane Batté's avatar Lauriane Batté
Browse files

Resolve merge conflict with develop branch

parents 9f7a68aa 6eec28c7
Hide whitespace changes
Inline Side-by-side
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