Viacheslav Klimov
a00e3be7ba
Merge branch 'master' into master-to-develop-snmp
# Conflicts:
# common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
# common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileTransportConfiguration.java
# common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java
# common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
# dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
# pom.xml
2021-04-12 15:45:39 +03:00
..
2021-04-09 13:06:43 +03:00
2021-04-09 12:37:08 +03:00
2021-03-30 13:26:50 +03:00
2021-04-09 12:37:08 +03:00
2021-03-25 10:06:06 +02:00
2021-04-09 12:37:08 +03:00