Commit 3ce42863 authored by Oliver Falk's avatar Oliver Falk

Merge branch 'devel' into 'master'

Merge devel <-> master

See merge request !151
parents b3fc0029 4f6ba484
Pipeline #1858 passed with stages
in 8 minutes and 30 seconds