public/app/features/templating · e83d13848e7d9a5bc6ef5da7fa59811ef4987e63 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

History Find file

Merge branch 'v3.0.x' · 696fad70
```
Conflicts:
	public/app/features/templating/templateValuesSrv.js
```
Torkel Ödegaard committed May 26, 2016
696fad70

Name	Last commit	Last Update
..
partials		Loading commit data...
editorCtrl.js		Loading commit data...
templateSrv.js		Loading commit data...
templateValuesSrv.js		Loading commit data...