Merge branch 'ticket_2828' into 'dev_cooperatic'

Ticket 2828

See merge request !171
2 jobs from dev_cooperatic in 1 minute 32 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #3512
lint:js

00:23

passed #3513
unit:django

01:08