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

..

src

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

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

pom.xml

Merge with master

2020-09-01 14:40:28 +03:00