Commit 317166b2 authored by Lukáš Krupčík's avatar Lukáš Krupčík

Merge branch 'salomon_upgrade' into 'master'

Salomon upgrade past tense...

See merge request !222
parents 9d6a28a4 ded36717
Pipeline #5613 passed with stages
in 12 minutes and 2 seconds