Merge branch 'master' of https://github.com/AlfredDobradi/nodebb-plugin-emailer-local

Conflicts:
	.gitignore