Merge branch '2420-regular-shift-admin' into 'dev_cooperatic'

2420 regular shift admin

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

00:22

passed #3158
unit:django

01:06