Johannes 'fish' Ziemke c108a9978d Merge branch 'master' of github.com:prometheus/prometheus into feature/navigation ... Conflicts: web/web.go		2013-04-05 14:16:33 +02:00
..
api	Depointerize Matrix/Vector types as well as time.Time arguments.	2013-03-28 18:07:12 +01:00
blob	Include nascent curator scaffolding.	2013-03-25 19:38:14 +01:00
static	Remove cruft.	2013-04-04 19:02:29 +02:00
templates	Add navigation menu to all pages + change routes.	2013-04-04 16:36:53 +02:00
handler.go	Add navigation menu to all pages + change routes.	2013-04-04 16:36:53 +02:00
Makefile	Include nascent curator scaffolding.	2013-03-25 19:38:14 +01:00
status.go	Split status template into two templates.	2013-03-27 17:40:01 +01:00
web.go	Use Sprintf instead of string concatenation.	2013-04-05 13:41:52 +02:00