vparomskiy 53f84b625b Merge remote-tracking branch 'origin/develop/2.0' into develop/2.0 ...

# Conflicts:
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java

2018-05-21 16:32:27 +03:00

..

src

Merge remote-tracking branch 'origin/develop/2.0' into develop/2.0

2018-05-21 16:32:27 +03:00

pom.xml

No more rules and plugins

2018-05-17 14:03:05 +03:00