public/app/plugins/panels/table/module.ts · 2b58b6b5d7d4263369efc8b8a980381628f853bd · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

Blame History Permalink

Merge branch 'master' into external-plugins · ee0e4d2b
```
Conflicts:
	public/app/plugins/panels/table/editor.ts
	public/views/index.html
```
Torkel Ödegaard committed Dec 02, 2015
ee0e4d2b

module.ts 3.11 KB