Merge branch 'it4i-salomon'

This commit is contained in:
Lukáš Krupčík 2019-04-29 11:31:05 +02:00
commit b85e5ee762