Dmytro Skarzhynets af18ec1953 Merge remote-tracking branch 'upstream/develop/3.5' into feature/enrichment-rule-nodes-improvements ...

# Conflicts:
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java

2023-03-23 12:48:04 +02:00

..

src

Merge remote-tracking branch 'upstream/develop/3.5' into feature/enrichment-rule-nodes-improvements

2023-03-23 12:48:04 +02:00

pom.xml

Merge with master

2023-01-31 16:20:04 +02:00