Merge branch 'master' into export-dashboard

Conflicts: .floo .flooignore
2016-05-18 08:08:15 +02:00
parent 05d064ca8d fc1891320e
commit 6632f883c0
42 changed files with 337 additions and 128 deletions
@@ -142,6 +142,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 			"buildstamp":    setting.BuildStamp,
 			"latestVersion": plugins.GrafanaLatestVersion,
 			"hasUpdate":     plugins.GrafanaHasUpdate,
+			"env":           setting.Env,
 		},
 	}