Fabian Reinartz 6e804b3497 Merge branch 'master' into dev-2.0		2017-05-12 13:29:58 +02:00
..
api/v1	Merge branch 'master' into dev-2.0	2017-05-12 13:29:58 +02:00
ui	ui: fix alert template	2017-05-10 15:30:10 +02:00
federate.go	web: Fix federation for instance label	2017-04-05 14:53:34 +02:00
federate_test.go	web: Fix federation for instance label	2017-04-05 14:53:34 +02:00
web.go	Merge branch 'master' into dev-2.0	2017-05-12 13:29:58 +02:00
web_test.go	Add missing license headers	2016-04-13 16:08:22 +02:00