Torkel Ödegaard 696fad702f Merge branch 'v3.0.x' ... Conflicts: public/app/features/templating/templateValuesSrv.js		2016-05-26 14:21:17 +02:00
..
core	[Bug Fix] #5136 (#5142)	2016-05-23 21:00:06 +02:00
lib	feat(plugins): changed what datasources should return, they should now return the datasource constructor	2016-01-09 13:21:16 +01:00
mocks	fix(timerange): fix handling of invalid dates in from/to url parameters, fixes #3345	2015-12-04 10:32:23 +01:00
specs	Merge branch 'v3.0.x'	2016-05-26 14:21:17 +02:00
.jshintrc	feat(templating): lots of progress on template variable context specific formats, #2918, all elasticsearch / lucene use cases seem to work now	2016-03-01 08:43:54 +01:00
test-main.js	Revert "Revert "Gauges""	2016-04-22 14:55:35 +02:00