Fabian Reinartz abf7c975c9 Merge branch 'master' into dev-2.0		2017-10-07 13:37:21 +02:00
..
api	Merge branch 'master' into dev-2.0	2017-10-07 13:37:21 +02:00
ui	Merge branch 'master' into dev-2.0	2017-10-05 13:09:18 +02:00
federate.go	Re-add contexts to storage.Storage.Querier() (#3230)	2017-10-04 21:04:15 +02:00
federate_test.go	Merge branch 'master' into dev-2.0	2017-09-04 14:09:21 +02:00
web.go	Merge branch 'master' into dev-2.0	2017-10-07 13:37:21 +02:00
web_test.go	Merge pull request #3240 from Gouthamve/fix-admin-api	2017-10-05 14:33:12 +02:00