liweifan 380ac71bcc Merge branch 'dev_1_2_20220802' into online 3 rokov pred
..
main 380ac71bcc Merge branch 'dev_1_2_20220802' into online 3 rokov pred
test 94316c53b8 update 3 rokov pred