Andrew Volostnykh
91d33c6597
Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/html-emails-copy
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
# rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/MailService.java
# rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
# rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js