Viacheslav Klimov f15f0e5483 Merge branch 'master' into fields-validation ...

# Conflicts:
#	common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
#	ui-ngx/src/app/modules/home/pages/admin/resource/resources-library.component.ts
#	ui-ngx/src/assets/locale/locale.constant-en_US.json

2021-08-30 11:14:04 +03:00

..

src

Merge branch 'master' into fields-validation

2021-08-30 11:14:04 +03:00

pom.xml

Version set to 3.3.1-SNAPSHOT

2021-08-16 12:39:43 +03:00