Fabian Reinartz 669075c6b9 Merge branch 'master' into dev-2.0		2017-06-06 09:36:51 +02:00
..
api/v1	Merge branch 'master' into dev-2.0	2017-05-12 13:29:58 +02:00
ui	Merge branch 'master' into dev-2.0	2017-06-06 09:36:51 +02:00
federate.go	Drop series for federation if latest sample is stale.	2017-05-24 14:27:17 +01:00
federate_test.go	Drop series for federation if latest sample is stale.	2017-05-24 14:27:17 +01:00
web.go	Merge branch 'master' into dev-2.0	2017-05-24 15:36:17 +02:00
web_test.go	Add missing license headers	2016-04-13 16:08:22 +02:00