Merge branch 'federation' into federated_remove_actions

author Dessalines <tyhou13@gmx.com>

Sun, 3 May 2020 17:22:32 +0000 (13:22 -0400)

committer Dessalines <tyhou13@gmx.com>

Sun, 3 May 2020 17:22:32 +0000 (13:22 -0400)
author Dessalines <tyhou13@gmx.com>
Sun, 3 May 2020 17:22:32 +0000 (13:22 -0400)
committer Dessalines <tyhou13@gmx.com>
Sun, 3 May 2020 17:22:32 +0000 (13:22 -0400)
diff --cc server/src/apub/fetcher.rs
Simple merge
diff --cc ui/src/api_tests/api.spec.ts
Simple merge
author	Dessalines <tyhou13@gmx.com>
	Sun, 3 May 2020 17:22:32 +0000 (13:22 -0400)
committer	Dessalines <tyhou13@gmx.com>
	Sun, 3 May 2020 17:22:32 +0000 (13:22 -0400)
		1	2
server/src/apub/fetcher.rs	patch \|	diff1 \|	diff2 \|	blob \| history
ui/src/api_tests/api.spec.ts	patch \|	diff1 \|	diff2 \|	blob \| history