Merge branch 'dev_cooperatic' into 2500-delete-extra-shift-display-date-bug

Status Job ID Name Coverage
  Test
passed #3017
lint:js

00:21

passed #3018
unit:django

01:05