Torkel Ödegaard cb83c237f4 Merge branch 'master' of github.com:grafana/grafana ... Conflicts: public/sass/_grafana.scss		2016-02-22 12:00:57 +01:00
..
cloudwatch	ux(): tweaks	2016-02-21 15:21:01 +01:00
elasticsearch	Merge branch 'master' of github.com:grafana/grafana	2016-02-22 12:00:57 +01:00
grafana	feat(plugins): made it possible to have relative plugin template urls	2016-02-09 18:17:32 +01:00
graphite	ux(annotations): migrate annotations editors to new form	2016-02-22 10:07:02 +01:00
influxdb	ux(annotations): migrate annotations editors to new form	2016-02-22 10:07:02 +01:00
mixed	fix(mixed datasource): fixed issue with mixed data source in optimized build	2016-01-21 13:14:25 +01:00
opentsdb	feat(plugins): made it possible to have relative plugin template urls	2016-02-09 18:17:32 +01:00
prometheus	ux(annotations): migrate annotations editors to new form	2016-02-22 10:07:02 +01:00