Torkel Ödegaard a4f9621473 Merge branch 'master' into query-editor-style 9 gadi atpakaļ
..
cloudwatch 82ad5a632d tech(): fixed broken tests due to angularjs upgrade 9 gadi atpakaļ
elasticsearch 82ad5a632d tech(): fixed broken tests due to angularjs upgrade 9 gadi atpakaļ
grafana 8784be9a14 feat(plugins): made it possible to have relative plugin template urls 10 gadi atpakaļ
grafana-live 585503f9fb fix(): renamed plugin.json for wip for new work in progress data source 9 gadi atpakaļ
graphite 82ad5a632d tech(): fixed broken tests due to angularjs upgrade 9 gadi atpakaļ
influxdb a4f9621473 Merge branch 'master' into query-editor-style 9 gadi atpakaļ
mixed 3d353c7d6d fix(mixed datasource): fixed issue with mixed data source in optimized build 10 gadi atpakaļ
opentsdb 82ad5a632d tech(): fixed broken tests due to angularjs upgrade 9 gadi atpakaļ
prometheus 82ad5a632d tech(): fixed broken tests due to angularjs upgrade 9 gadi atpakaļ