Skip to content
GitLab
Commit fb6f43d0 authored by Chloé Prodhomme's avatar Chloé Prodhomme
Browse files

Revert "merge conflict after master rebase" 

This reverts commit 82bbaaeb.
parent c40cab04
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