Maksym Dudnik 1b4734d4d8 Merge branch 'develop/3.5' of https://github.com/thingsboard/thingsboard into gateway_list ...

 Conflicts:

	ui-ngx/src/app/modules/home/components/home-components.module.ts

	ui-ngx/src/app/modules/home/components/shared-home-components.module.ts

2023-04-07 16:31:26 +03:00

..

src

Merge branch 'develop/3.5' of https://github.com/thingsboard/thingsboard into gateway_list

2023-04-07 16:31:26 +03:00

.gitignore

…

pom.xml

Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system

2023-03-06 10:21:41 +02:00