YevhenBondarenko
f0c2b5df35
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.3.3
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
# application/src/main/resources/thingsboard.yml
# application/src/test/java/org/thingsboard/server/transport/TransportSqlTestSuite.java
# common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java
# ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-components.module.ts