Merge branch '2417-diferent-color-for-makeups' into 'dev_cooperatic'

develop

See merge request !137
2 jobs from dev_cooperatic in 1 minute 27 seconds (queued for 1 minute 31 seconds)
Status Job ID Name Coverage
  Test
passed #2961
lint:js

00:21

passed #2962
unit:django

01:06