Commit 72cfbd8f authored by Alexander Færøy's avatar Alexander Færøy

Merge branch 'develop' into 'develop'

Develop

See merge request !3
parents a17cd9b7 4a0c9374
Pipeline #100 failed with stage
in 18 seconds