Commit 371d0076 authored by Max Richter's avatar Max Richter
Browse files

Merge branch 'dev' into 'master'

Dev

See merge request !35
parents 69db77c1 b93d3870
Pipeline #1864 canceled with stages
in 49 seconds