ViacheslavKlimov 4ff3f7851c Merge branch 'master' into feature/push-notifications ...

# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/BaseController.java

2024-02-15 11:21:56 +02:00

..

src

Merge branch 'master' into feature/push-notifications

2024-02-15 11:21:56 +02:00

.gitignore

…

pom.xml

Merge remote-tracking branch 'upstream/master' into feature/push-notifications

2024-01-09 15:20:49 +02:00