Merge branch '6-add-more-grids-templates' into 'master'
Passed
Benoît Harrault
created pipeline for commit
529a9718
, finished
For 11-show-conflicts-in-grid
5 minutes 0 seconds, queued for 132 seconds