thingsboard/rule-engine/rule-engine-components
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
..
2022-12-05 17:54:19 +02:00