ViacheslavKlimov 03cb21b79a Merge branch 'hotfix/3.6.3' into master-with-hotfix ...

# Conflicts:
#	common/util/src/main/java/org/thingsboard/common/util/SslUtil.java

2024-03-25 09:56:57 +02:00

..

src

Merge branch 'hotfix/3.6.3' into master-with-hotfix

2024-03-25 09:56:57 +02:00

.gitignore

…

pom.xml

Merge branch 'master' into develop/3.7

2024-03-19 15:44:23 +02:00