Merge remote-tracking branch 'origin/master'

LinuxSuRen · LinuxSuRen · commit a8cc65b7e354 · 2017-06-20T19:45:04.000+08:00
# Conflicts:
#	src/main/java/org/suren/autotest/web/framework/settings/AutoModuleProxy.java
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,3 +1,4 @@
 mail.host=smtp.qq.com
 mail.username=
-mail.password=
+mail.password=
+mail.port=25
