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

..

src

Merge branch 'master' into master-to-snmp

2021-04-20 18:08:10 +03:00

pom.xml

Merge branch 'master' into master-to-snmp

2021-04-20 18:08:10 +03:00