nickAS21 f38040f5f9 Merge branch 'develop/3.4' into refactoring_07_OtaPackage_08_RuleChain_09_TbResource ...

# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java

2022-06-02 19:53:33 +03:00

..

src

Merge branch 'develop/3.4' into refactoring_07_OtaPackage_08_RuleChain_09_TbResource

2022-06-02 19:53:33 +03:00

.gitignore

Add Chinese Translation for Version 1.2.3 (#131)

2017-05-07 22:38:50 +03:00

pom.xml

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

2022-05-26 17:44:38 +03:00