Viacheslav Klimov 37b88908fd Fix merge errors

2021-03-15 12:43:42 +02:00

..

actor

Version set to 3.3.0-SNAPSHOT. Code style improvements.

2021-03-04 12:37:38 +02:00

cache

[WIP]added redis stores support to lwm2m transport (#4164)

2021-02-26 14:16:34 +02:00

dao-api

added resource dao support (#4213)

2021-03-09 19:45:28 +02:00

data

Merge remote-tracking branch 'thingsboard/develop/3.3' into develop/snmp

2021-03-10 15:22:03 +02:00

message

Version set to 3.3.0-SNAPSHOT. Code style improvements.

2021-03-04 12:37:38 +02:00

queue

added resource dao support (#4213)

2021-03-09 19:45:28 +02:00

stats

Version set to 3.3.0-SNAPSHOT. Code style improvements.

2021-03-04 12:37:38 +02:00

transport

Fix merge errors

2021-03-15 12:43:42 +02:00

util

Version set to 3.3.0-SNAPSHOT. Code style improvements.

2021-03-04 12:37:38 +02:00

pom.xml

Version set to 3.3.0-SNAPSHOT. Code style improvements.

2021-03-04 12:37:38 +02:00