Skip to content
Snippets Groups Projects
Commit d979922e authored by Alice Poggioli's avatar Alice Poggioli
Browse files

fix conflict

parents ccf4d10b 804fb33d
No related branches found
No related tags found
1 merge request!44Master to dev
Pipeline #8956 passed
Stage: test