Sergey Matvienko 87b3de09ad Merge branch 'master' into feature/sql-query-timeout ...

# Conflicts:
#	dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java
#	dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java

2021-10-12 14:19:10 +03:00

..

src

Merge branch 'master' into feature/sql-query-timeout

2021-10-12 14:19:10 +03:00

.gitignore

Add Chinese Translation for Version 1.2.3 (#131)

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

pom.xml

Version set to 3.3.2-SNAPSHOT

2021-09-06 18:55:10 +03:00