Torkel Ödegaard ec0b09450c Merge branch 'export-dashboard' ... 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		2016-06-16 08:06:43 +02:00
..
dash_list.html	feat(dashboards): began work on dashboard list	2016-05-19 11:03:10 +02:00
globalAlerts.html	ux(): minor style fixes to pages	2016-01-15 15:51:30 +01:00
graphiteImport.html	ux(import): minor fixes	2016-02-23 10:24:47 +01:00
migrate.html	feat(dashboards): began work on dashboard list	2016-05-19 11:03:10 +02:00
saveDashboardAs.html	ux(): work on new modal design #4191	2016-03-02 21:27:08 +01:00
settings.html	Merge branch 'export-dashboard'	2016-06-16 08:06:43 +02:00
shareModal.html	fix(export): style fixes and markup fixes for share modal	2016-05-25 13:01:40 +02:00