Commit 877d6e88 authored by Haakon Gunleiksrud's avatar Haakon Gunleiksrud
Browse files

Merge branch 'dev' into 'master'

Dev

See merge request !22
parents b5df6720 c2e2151a
Pipeline #126967 passed with stage
in 58 seconds