Merge branch 'shared_inbox_1' into add_federated_post_likes

author Dessalines <tyhou13@gmx.com>

Tue, 28 Apr 2020 02:48:20 +0000 (22:48 -0400)

committer Dessalines <tyhou13@gmx.com>

Tue, 28 Apr 2020 02:48:20 +0000 (22:48 -0400)
author Dessalines <tyhou13@gmx.com>
Tue, 28 Apr 2020 02:48:20 +0000 (22:48 -0400)
committer Dessalines <tyhou13@gmx.com>
Tue, 28 Apr 2020 02:48:20 +0000 (22:48 -0400)
diff --cc server/src/apub/mod.rs
Simple merge
diff --cc server/src/apub/shared_inbox.rs
Simple merge
author	Dessalines <tyhou13@gmx.com>
	Tue, 28 Apr 2020 02:48:20 +0000 (22:48 -0400)
committer	Dessalines <tyhou13@gmx.com>
	Tue, 28 Apr 2020 02:48:20 +0000 (22:48 -0400)
		1	2
server/src/apub/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
server/src/apub/shared_inbox.rs	patch \|	diff1 \|	diff2 \|	blob \| history