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
..
core	Merge branch 'export-dashboard'	2016-06-16 08:06:43 +02:00
features	Merge branch 'export-dashboard'	2016-06-16 08:06:43 +02:00
headers	tech(): put in a real event emitter instead of rxjs based on that was broken	2016-04-07 19:47:48 -04:00
partials	Merge branch 'master' into export-dashboard	2016-05-25 12:32:56 +02:00
plugins	feat(graph): graph tooltip sort order PR refactored/changed #4944, changed the layout graph display options, #4944	2016-06-15 17:20:55 +02:00
app.ts	use async apply (#5258)	2016-06-06 17:18:10 +02:00
boot.js	fix(build): fixed minor issue in systemjs builder, and added SystemJs cache buster	2016-02-10 06:50:17 +01:00
system.conf.js	Revert "Revert "Gauges""	2016-04-22 14:55:35 +02:00