Merge branch 'master' into external-plugins

Conflicts: public/app/plugins/panels/table/editor.ts public/views/index.html
2015-12-02 18:30:48 +01:00
parent bd8f5e9bfd 8eb3e48bc7
commit ee0e4d2b69
63 changed files with 1876 additions and 641 deletions
@@ -40,6 +40,7 @@ type DashboardMeta struct {
 	Slug       string    `json:"slug"`
 	Expires    time.Time `json:"expires"`
 	Created    time.Time `json:"created"`
+	Updated    time.Time `json:"updated"`
 }

 type DashboardFullWithMeta struct {