Merge branch 'master' into feature/discord

2018-04-08 20:09:56 +02:00
parent 1bf982439b ce787b88bf
commit 30f048965c
4486 changed files with 636351 additions and 459241 deletions
@@ -3,6 +3,7 @@ package models
 import "errors"

 var ErrInvalidEmailCode = errors.New("Invalid or expired email code")
+var ErrSmtpNotEnabled = errors.New("SMTP not configured, check your grafana.ini config file's [smtp] section.")

 type SendEmailCommand struct {
 	To           []string