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
..
2022-01-17 14:07:46 +02:00
2021-12-06 12:54:48 +02:00
2022-01-17 14:07:46 +02:00
2020-03-23 16:29:15 +02:00
2022-02-21 12:19:59 +02:00
2022-01-17 14:07:46 +02:00
2021-12-06 14:00:21 +02:00
2020-08-13 19:00:48 +03:00