gaodm 5003b9c739 Merge branch 'dev/20200603_1.2.2' into dev/20200603_1.3.1 5 gadi atpakaļ
..
java 5003b9c739 Merge branch 'dev/20200603_1.2.2' into dev/20200603_1.3.1 5 gadi atpakaļ
resources 5003b9c739 Merge branch 'dev/20200603_1.2.2' into dev/20200603_1.3.1 5 gadi atpakaļ