Merge branch 'master' into websocket

2016-03-17 10:16:05 +01:00
parent 79a803ea8f b2fe7e518f
commit 9ddf22ea93
11 changed files with 144 additions and 10 deletions
@@ -40,7 +40,7 @@ func GetDataSources(c *middleware.Context) {
 		if plugin, exists := plugins.DataSources[ds.Type]; exists {
 			dsItem.TypeLogoUrl = plugin.Info.Logos.Small
 		} else {
-			dsItem.TypeLogoUrl = "public/img/plugin-default-logo_dark.svg"
+			dsItem.TypeLogoUrl = "public/img/icn-datasources.svg"
 		}

 		result = append(result, dsItem)