Viacheslav Klimov
3c1682f57a
Merge branch 'master' into master-to-snmp
# Conflicts:
# common/data/pom.xml
# common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
# dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java
# ui-ngx/src/app/shared/models/device.models.ts
2021-04-20 18:08:10 +03:00
..
2021-04-09 12:37:08 +03:00
2021-02-26 14:16:34 +02:00
2021-04-09 13:06:43 +03:00
2021-04-20 18:08:10 +03:00
2021-04-20 18:08:10 +03:00
2021-04-09 19:53:46 +03:00
2021-04-09 12:37:08 +03:00
2021-04-20 18:08:10 +03:00
2021-04-09 12:37:08 +03:00
2021-04-20 18:08:10 +03:00
2021-04-09 12:37:08 +03:00
2021-04-09 19:04:26 +03:00