Merge branch '2897-pop-up-text' into 'dev_cooperatic'

2897-pop-up-text

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

00:22

passed #3434
unit:django

01:09