Skip to content
Snippets Groups Projects
Commit 5f6335e9 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '11-show-conflicts-in-grid' into 'master'

Resolve "Show conflicts in grid"

Closes #11

See merge request !11
parents 93222b5b 2ce6ca92
No related branches found
No related tags found
Loading
Checking pipeline status