YevhenBondarenko ffe16b8dfb Merge remote-tracking branch 'upstream/master' into feature/bulk-import/device-credentials ...

# Conflicts:
#	ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts

2021-09-09 17:18:28 +03:00

..

src/main/java/org/thingsboard/server/dao

Merge remote-tracking branch 'upstream/master' into feature/bulk-import/device-credentials

2021-09-09 17:18:28 +03:00

pom.xml

Version set to 3.3.2-SNAPSHOT

2021-09-06 18:55:10 +03:00