public/app/plugins · ece8a925a6df8b6d57cdeba579dba6313d83d4a0 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

History Find file

Merge branch 'master' of github.com:grafana/grafana · ece8a925
```
Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json
```
Torkel Ödegaard committed Mar 11, 2016
ece8a925

Name	Last commit	Last Update
..
datasource		Loading commit data...
panel		Loading commit data...
plugin_api.md		Loading commit data...
sdk.ts		Loading commit data...