vzikratyi
b02fbe860c
Merge branch 'develop/3.2' into feature/dynamic-oauth2-new-table
# Conflicts:
# application/src/main/java/org/thingsboard/server/controller/BaseController.java
# application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
# application/src/main/java/org/thingsboard/server/service/security/permission/Resource.java
# application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.java
# common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
# common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
# dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
# dao/src/test/resources/sql/hsql/drop-all-tables.sql
# dao/src/test/resources/sql/psql/drop-all-tables.sql
# dao/src/test/resources/sql/timescale/drop-all-tables.sql
# ui-ngx/src/app/modules/home/pages/tenant/tenant.component.ts
2020-10-08 11:22:13 +03:00
..
2020-08-13 19:00:48 +03:00
2020-10-08 11:22:13 +03:00
2020-02-20 10:26:43 +02:00
2019-08-08 19:39:06 +03:00
2020-10-06 19:22:40 +03:00
2020-02-20 10:26:43 +02:00
2020-03-23 16:29:15 +02:00
2020-10-06 19:22:40 +03:00
2020-09-14 14:25:08 +03:00
2020-08-14 17:29:55 +03:00
2020-08-14 15:41:28 +03:00
2020-08-13 19:00:48 +03:00
2020-08-13 19:00:48 +03:00
2020-10-06 19:22:40 +03:00