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-01-11 13:42:16 +02:00
2021-05-27 10:58:34 +03:00
2020-03-23 16:29:15 +02:00
2021-05-27 10:58:34 +03:00
2021-04-09 12:37:08 +03:00
2021-01-05 11:37:05 +02:00
2020-08-13 19:00:48 +03:00
2021-05-27 10:58:34 +03:00