nickAS21 68ba6892d3 Merge branch 'master' into lwm2m_coap_url_in_out
# Conflicts:
#	common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java
#	common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/OtaPackageTransportResource.java
2021-06-20 12:06:59 +03:00
..
2021-05-25 19:36:09 +03:00
2021-01-11 13:42:16 +02:00
2021-03-04 17:11:55 +02:00
2021-01-11 13:42:16 +02:00
2021-06-03 18:54:09 +03:00
2020-10-08 11:45:50 +03:00
2020-10-08 11:45:50 +03:00
2020-04-28 11:57:09 +03:00