Erik Sundell 9e558b70d7 Merge branch '14293-metric-display-names' into reactify-stackdriver ... # Conflicts: # public/app/plugins/datasource/stackdriver/partials/query.aggregation.html # public/app/plugins/datasource/stackdriver/partials/query.editor.html # public/app/plugins/datasource/stackdriver/partials/query.filter.html # public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts # public/app/plugins/datasource/stackdriver/query_ctrl.ts # public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts # public/sass/_grafana.scss		2018-12-19 09:21:35 +01:00
..
core	Merge branch '14293-metric-display-names' into reactify-stackdriver	2018-12-19 09:21:35 +01:00
features	Minor cleanup now that angular panel edit is no longer	2018-12-17 21:29:25 +01:00
partials	Merge branch 'master' into develop	2018-12-05 10:17:22 +01:00
plugins	Merge branch '14293-metric-display-names' into reactify-stackdriver	2018-12-19 09:21:35 +01:00
routes	removing test page	2018-11-16 16:58:08 +01:00
store	extract store from configurestore	2018-11-05 16:54:48 +01:00
types	explore using data source picker	2018-12-14 14:05:47 +01:00
viz	display value map or range map	2018-12-12 11:04:34 +01:00
app.ts	WIP babel 7	2018-10-29 12:20:10 +01:00
dev.ts	Add weback-dev-server with hot/hmr support	2018-04-19 11:42:53 +02:00
index.ts	prettier: change to single quoting	2017-12-20 12:33:33 +01:00