Merge branch 'main' into move_matrix_and_admin_to_person

author Dessalines <tyhou13@gmx.com>

Tue, 23 Mar 2021 18:16:54 +0000 (14:16 -0400)

committer Dessalines <tyhou13@gmx.com>

Tue, 23 Mar 2021 18:16:54 +0000 (14:16 -0400)
author Dessalines <tyhou13@gmx.com>
Tue, 23 Mar 2021 18:16:54 +0000 (14:16 -0400)
committer Dessalines <tyhou13@gmx.com>
Tue, 23 Mar 2021 18:16:54 +0000 (14:16 -0400)
diff --cc crates/api/src/comment.rs
Simple merge
diff --cc crates/api/src/local_user.rs
Simple merge
diff --cc crates/api/src/post.rs
Simple merge
author	Dessalines <tyhou13@gmx.com>
	Tue, 23 Mar 2021 18:16:54 +0000 (14:16 -0400)
committer	Dessalines <tyhou13@gmx.com>
	Tue, 23 Mar 2021 18:16:54 +0000 (14:16 -0400)
		1	2
crates/api/src/comment.rs	patch \|	diff1 \|	diff2 \|	blob \| history
crates/api/src/local_user.rs	patch \|	diff1 \|	diff2 \|	blob \| history
crates/api/src/post.rs	patch \|	diff1 \|	diff2 \|	blob \| history