Merge branch '11-show-conflicts-in-grid' into 'master'
Passed
Benoît Harrault
created pipeline for commit
5f6335e9
, finished
For 20-allow-non-square-sub-blocks
3 minutes 56 seconds, queued for 1 seconds