public/app/plugins/datasource/prometheus/partials/query.editor.html · 106fe4854f818bc53b27c1c06ef01913a355edcc · Kornkitt Poolsup / nexpie-grafana-theme

Merge branch 'prometheus' of github.com:grafana/grafana · 106fe485

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

committed Oct 06, 2015

106fe485

query.editor.html 3.62 KB