AndriiD 2ea6896507 Merge remote-tracking branch 'origin/develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil ...

# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java

2023-04-17 00:22:12 +03:00

..

src

Merge remote-tracking branch 'origin/develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil

2023-04-17 00:22:12 +03:00

pom.xml

Merge with master

2023-01-31 16:20:04 +02:00