Commit 931189ba authored by Praetorius, Simon's avatar Praetorius, Simon

Merge branch 'develop' into 'master'

Develop

See merge request !103
parents 4646e930 3efd88e3
Pipeline #1839 passed with stage
in 48 minutes and 21 seconds