Commit 7adaa7c4 authored by Oliver Falk's avatar Oliver Falk

Merge branch 'devel' into 'master'

X-Mas release

Closes #77

See merge request !177
parents ba4c1a84 9a40beda
Pipeline #2039 passed with stages
in 10 minutes and 5 seconds