Merge branch 'guisettingsandscaling' into 'master'
Passed
Oscar Gustafsson
created pipeline for commit
492645c5
, finished
For master
3 minutes 53 seconds, queued for 9 seconds