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
..
2021-01-11 13:42:16 +02:00
2021-06-03 18:54:09 +03:00
2021-03-02 12:04:45 +02:00