ViacheslavKlimov dd5c970b3a Merge remote-tracking branch 'origin/develop/3.5' into feature/notification-system ...

# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/BaseController.java

2023-02-20 12:57:32 +02:00

..

src

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

2023-02-20 12:57:32 +02:00

.gitignore

Add Chinese Translation for Version 1.2.3 (#131)

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

pom.xml

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

2023-02-14 11:09:34 +02:00