Commit 29287f01 authored by David Hrbáč's avatar David Hrbáč

Merge branch 'salomon_upgrade' into 'master'

Salomon upgrade

See merge request !220
parents e9f19900 9c3ebb0a
Pipeline #5474 passed with stages
in 13 minutes and 48 seconds