Lovisa Svallingson 2c2702e22b Align columns in Targets view (#3445) ... - rebase and resolve merge conflicts		2017-11-26 12:49:24 +08:00
..
api	*: adapt to storage interface changes	2017-11-23 19:05:04 +01:00
ui	Align columns in Targets view (#3445)	2017-11-26 12:49:24 +08:00
federate_test.go	Merge branch 'master' into dev-2.0	2017-09-04 14:09:21 +02:00
federate.go	*: adapt to storage interface changes	2017-11-23 19:05:04 +01:00
web_test.go	Merge pull request #3286 from prometheus/dev-2.0	2017-10-12 16:19:10 +02:00
web.go	Refactor main.go with oklog/pkg/group actors pattern	2017-11-11 12:33:15 +00:00