gaodm 318e6ce2c2 Merge branch 'develop' into dev/mrman20200117_init 5 rokov pred
..
main 318e6ce2c2 Merge branch 'develop' into dev/mrman20200117_init 5 rokov pred
test 0b9dd1dfda 初始版本 6 rokov pred