Fabian Reinartz 8ffc851147 Merge branch 'master' into dev-2.0		2017-04-04 15:17:56 +02:00
..
api/v1	web: deduplicate series in federation	2017-04-04 11:20:23 +02:00
ui	Merge branch 'master' into dev-2.0	2017-04-04 15:17:56 +02:00
federate.go	Merge branch 'master' into dev-2.0	2017-04-04 15:17:56 +02:00
federate_test.go	Send instance="" with federation if instance not set.	2017-03-30 06:48:48 +01:00
web.go	Merge branch 'master' into dev-2.0	2017-04-04 15:17:56 +02:00
web_test.go	Add missing license headers	2016-04-13 16:08:22 +02:00