pkg/plugins · 32479503bd4fcb9d4cb87310a010076e3da78b3a · Kornkitt Poolsup / nexpie-grafana-theme

Merge branch 'export-dashboard' · ec0b0945

Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js

committed Jun 16, 2016

ec0b0945

Name	Last commit	Last Update
..
app_plugin.go		Loading commit data...
dashboard_importer.go		Loading commit data...
dashboard_importer_test.go		Loading commit data...
dashboards.go		Loading commit data...
dashboards_test.go		Loading commit data...
datasource_plugin.go		Loading commit data...
frontend_plugin.go		Loading commit data...
models.go		Loading commit data...
panel_plugin.go		Loading commit data...
plugins.go		Loading commit data...
plugins_test.go		Loading commit data...
queries.go		Loading commit data...
update_checker.go		Loading commit data...