Viacheslav Klimov a85dcdbd3c Merge branch 'develop/3.4' into feature/2fa ...

# Conflicts:
#	application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
#	pom.xml
#	ui-ngx/src/assets/locale/locale.constant-en_US.json

2022-05-06 11:42:10 +03:00

..

src

Merge branch 'develop/3.4' into feature/2fa

2022-05-06 11:42:10 +03:00

pom.xml

Merge pull request #6265 from YevhenBondarenko/feature/update-versions

2022-04-08 14:30:04 +03:00