vzikratyi 985e0350d8 Merge branch 'master' into feature/dynamic-oauth2-new-table ...

# Conflicts:
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java

2020-10-08 15:38:13 +03:00

..

actor

Merge with master

2020-09-14 14:25:08 +03:00

dao-api

Refactored and fixed code

2020-10-08 12:22:26 +03:00

data

Merge branch 'master' into feature/dynamic-oauth2-new-table

2020-10-08 15:38:13 +03:00

message

Scheduler for Device Profile Alarms

2020-10-05 18:53:15 +03:00

queue

Merge with master

2020-09-16 12:12:59 +03:00

stats

Merge with master

2020-09-14 14:25:08 +03:00

transport

Merge with develop 2.5.5

2020-10-07 12:11:37 +03:00

util

Merge with master

2020-09-14 14:25:08 +03:00

pom.xml

Merge with master

2020-09-14 14:25:08 +03:00