Merge branch 'master' of github.com:grafana/grafana into develop

This commit is contained in:
Torkel Ödegaard
2017-10-11 16:47:16 +02:00
49 changed files with 2619 additions and 766 deletions
+1
View File
@@ -96,6 +96,7 @@ func CreateUser(cmd *m.CreateUserCommand) error {
EmailVerified: cmd.EmailVerified,
Created: time.Now(),
Updated: time.Now(),
LastSeenAt: time.Now().AddDate(-10, 0, 0),
}
if len(cmd.Password) > 0 {