nickAS21 9e1cb8593f Merge branch 'develop/3.4' into refactoring_test_customer_05 ...

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

2022-06-21 08:05:28 +03:00

..

src

Merge branch 'develop/3.4' into refactoring_test_customer_05

2022-06-21 08:05:28 +03:00

.gitignore

Add Chinese Translation for Version 1.2.3 (#131)

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

pom.xml

Merge with develop/3.4

2022-06-02 13:59:15 +03:00