Merge branch 'mairedev' into 'master'

Mairedev

See merge request !23
2 jobs for master in 4 minutes and 25 seconds (queued for 23 seconds)
Status Job ID Name Coverage
  Test
passed #16702
docker-runner
test_acc

00:04:24

 
  Deploy
passed #16703
devel

00:00:00