Merge branch 'it4i-salomon'

This commit is contained in:
Lukáš Krupčík 2019-07-16 09:22:15 +02:00
commit c611fd14f0