caozj 37a682ae49 Merge branch 'master' into dev 1 rok pred
..
main 37a682ae49 Merge branch 'master' into dev 1 rok pred
test a8c46f9423 ding 2 rokov pred