周箭河 24f27270b4 Merge branch 'maintenance_feature' into 20200324 4 rokov pred
..
main 24f27270b4 Merge branch 'maintenance_feature' into 20200324 4 rokov pred
test 86de033255 update 6 rokov pred