Commit 0ff1fae8 authored by Lukáš Krupčík's avatar Lukáš Krupčík

Merge branch 'master' into 'hot_fix'

Master

See merge request sccs/docs.it4i.cz!196
parents cc0f807c a6f4ae2d
Pipeline #3917 passed with stages
in 57 seconds