merge conflict

2 jobs from aide_a_la_commande in 1 minute 23 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #1399
lint:js

00:22

passed #1400
unit:django

01:01