YevhenBondarenko d91c52487f Merge branch 'master' of https://github.com/thingsboard/thingsboard into fix/ws
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
2021-03-03 14:38:42 +02:00
..
2021-03-03 12:02:06 +02:00