Merge branch '9-fix-display-conflicts' into 'master'
Passed
Benoît Harrault
created pipeline for commit f0752533
, finished
For 11-upgrade-framework-and-dependencies
8 minutes 37 seconds, queued for 1,263 seconds