beorn7 f7fc542db6 Merge branch 'master' into beorn7/storage4 ... Conflicts: storage/local/persistence.go		2016-03-08 00:14:00 +01:00
..
api	Unify duration parsing	2016-01-29 15:41:50 +01:00
ui	Consolidate TargetStatus into Target.	2016-03-01 14:33:21 +01:00
federate.go	Return SamplePair istead of *SamplePair consistently	2016-02-19 17:00:40 +01:00
web_test.go	Add tests for "globalURL" template function.	2015-07-03 14:47:52 +02:00
web.go	Make time parameter optional in v1 query API	2015-11-11 13:30:06 -08:00