ViacheslavKlimov aa89d0e936 Merge branch 'master' into feature/notification-system ...

# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
#	application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java
#	application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java
#	application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java

2022-12-15 15:32:26 +02:00

..

src

Merge branch 'master' into feature/notification-system

2022-12-15 15:32:26 +02:00

.gitignore

Add Chinese Translation for Version 1.2.3 (#131)

2017-05-07 22:38:50 +03:00

pom.xml

Version set to 3.4.3-SNAPSHOT

2022-12-05 17:54:19 +02:00