Viacheslav Klimov 47994e1a66 Merge branch 'master' into master-to-snmp
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
#	common/queue/src/main/proto/queue.proto
#	common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java
#	common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportContext.java
#	dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
2021-04-26 13:37:39 +03:00
..
2021-04-23 11:40:52 +03:00
2021-04-23 11:40:52 +03:00
2021-04-23 11:40:52 +03:00
2021-04-23 11:40:52 +03:00
2021-03-25 10:06:06 +02:00
2021-04-09 12:37:08 +03:00