grafana/public/test
Torkel Ödegaard 106fe4854f Merge branch 'prometheus' of github.com:grafana/grafana
Conflicts:
	pkg/models/datasource.go
	public/app/plugins/datasource/prometheus/datasource.js
	public/app/plugins/datasource/prometheus/partials/query.editor.html
	public/app/plugins/datasource/prometheus/queryCtrl.js
2015-10-06 16:36:58 +02:00
..
lib refactor: moved graphite specs into plugins directory 2015-09-28 15:23:53 +02:00
mocks Renamed src directory to public 2015-03-29 12:57:28 +02:00
specs Merge branch 'prometheus' of github.com:grafana/grafana 2015-10-06 16:36:58 +02:00
.jshintrc Renamed src directory to public 2015-03-29 12:57:28 +02:00
test-main.js refactor: moved graphite specs into plugins directory 2015-09-28 15:23:53 +02:00
tests.html Renamed src directory to public 2015-03-29 12:57:28 +02:00