Viacheslav Klimov e33a336ed9 Merge remote-tracking branch 'origin/master' into feature/bulk-import/device-credentials ...

# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/DeviceController.java
#	application/src/main/java/org/thingsboard/server/controller/EdgeController.java
#	common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
#	ui-ngx/src/app/core/http/device.service.ts

2021-08-09 12:27:53 +03:00

..

src

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

2021-08-09 12:27:53 +03:00

pom.xml

Version set to 3.3.0-SNAPSHOT

2021-04-09 12:37:08 +03:00