gaodm 14ba84609a Merge branch 'develop' into dev/vteplus_20211115 3 gadi atpakaļ
..
java 14ba84609a Merge branch 'develop' into dev/vteplus_20211115 3 gadi atpakaļ
resources 14ba84609a Merge branch 'develop' into dev/vteplus_20211115 3 gadi atpakaļ