Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	plugins/eMail/eMail.py
This commit is contained in:
Bastian Schroll 2016-10-27 22:11:19 +02:00
commit 78cecc7ef5

View file

@ -103,7 +103,7 @@ def run(typ,freq,data):
#
# connect to SMTP-Server
#
server = smtplib.SMTP(globalVars.config.get("eMail", "smtp_server"), globalVars.config.get("eMail", "smtp_port"))
server = smtplib.SMTP_SSL(globals.config.get("eMail", "smtp_server"), globals.config.get("eMail", "smtp_port"))
# debug-level to shell (0=no debug|1)
server.set_debuglevel(0)