ViacheslavKlimov f98eee5407 Merge branch 'develop/3.5.2' into feature/exceeded-rate-limits-notifications ...

# Conflicts:
#	application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
#	application/src/main/resources/thingsboard.yml
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
#	dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
#	ui-ngx/src/app/modules/common/modules-map.ts

2023-06-13 13:49:51 +03:00

..

src/main/java/org/thingsboard/server/dao

Merge branch 'develop/3.5.2' into feature/exceeded-rate-limits-notifications

2023-06-13 13:49:51 +03:00

pom.xml

Version set to 3.5.2-SNAPSHOT

2023-05-22 16:32:24 +03:00