Viacheslav Klimov 44c1cbcbc0 Merge remote-tracking branch 'thingsboard/develop/3.3' into develop/snmp
# Conflicts:
#	application/pom.xml
#	application/src/main/resources/thingsboard.yml
#	common/transport/pom.xml
#	msa/transport/pom.xml
#	pom.xml
#	transport/pom.xml
#	ui-ngx/src/app/modules/home/components/home-components.module.ts
#	ui-ngx/src/app/modules/home/components/profile/device/device-profile-transport-configuration.component.html
#	ui-ngx/src/app/shared/models/device.models.ts
2021-03-10 15:22:03 +02:00
..
2021-03-05 17:40:13 +02:00