public/app/plugins/panels/graph · 27a0ef7ee8c0d87ad2788b6aa9f517503def6614 · Kornkitt Poolsup / nexpie-grafana-theme

Merge branch 'master' into external-plugins · 201f50b1

Conflicts:
	pkg/api/login.go
	public/app/core/routes/all.js
	public/app/core/table_model.ts
	public/app/panels/table/table_model.ts
	public/app/plugins/panels/table/editor.ts
	public/app/plugins/panels/table/table_model.ts

committed Dec 14, 2015

201f50b1

Name	Last commit	Last Update
..
axisEditor.html		Loading commit data...
graph.js		Loading commit data...
graph.tooltip.js		Loading commit data...
legend.js		Loading commit data...
legend.popover.html		Loading commit data...
module.html		Loading commit data...
module.js		Loading commit data...
plugin.json		Loading commit data...
seriesOverridesCtrl.js		Loading commit data...
styleEditor.html		Loading commit data...