Merge branch Grafana v5 'develop' branch

This commit is contained in:
Torkel Ödegaard
2017-12-15 12:06:09 +01:00
522 changed files with 31990 additions and 10112 deletions

View File

@@ -25,7 +25,6 @@ func createDashboardJson(data *simplejson.Json, lastModified time.Time, cfg *Das
dash.UpdatedAt = lastModified
dash.Overwrite = true
dash.OrgId = cfg.OrgId
dash.Folder = cfg.Folder
dash.Dashboard.Data.Set("editable", cfg.Editable)
if dash.Dashboard.Title == "" {