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
..
2021-09-06 18:55:10 +03:00