Merge branch 'development' into 'master'

Merge 'development' branch into 'master'

See merge request adega/adega!50
1 job for 1.0.0 in 18 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Test
passed #35389
regular ubuntu
django-tests

00:00:18