merge conflict

2 jobs from 2865-email-bdm-desolidarisation in 1 minute 28 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #3368
lint:js

00:21

passed #3369
unit:django

01:06