ViacheslavKlimov e391459343 Merge remote-tracking branch 'origin/master' into feature/notification-system
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
#	dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java
#	rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
2022-11-06 18:55:41 +02:00
..
2022-08-19 15:25:18 +03:00