Merge branch 'master' into alerting_definitions

2016-05-09 11:34:56 +02:00
parent 47070f2d1f 040dd91d2e
commit 35c73902da
23 changed files with 97 additions and 55 deletions
@@ -29,6 +29,7 @@ type PluginListItem struct {
 	Info          *plugins.PluginInfo `json:"info"`
 	LatestVersion string              `json:"latestVersion"`
 	HasUpdate     bool                `json:"hasUpdate"`
+	DefaultNavUrl string              `json:"defaultNavUrl"`
 }

 type PluginList []PluginListItem