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-07-23 13:57:25 +03:00
2020-03-23 16:29:15 +02:00
2021-07-23 13:57:25 +03:00
2021-07-15 10:39:58 +03:00
2021-01-05 11:37:05 +02:00
2020-08-13 19:00:48 +03:00
2021-07-23 13:57:25 +03:00