Merge pull request #1180 from LemmyNet/no_conflict_triggers

author Dessalines <dessalines@users.noreply.github.com>

Thu, 8 Oct 2020 18:51:04 +0000 (14:51 -0400)

committer GitHub <noreply@github.com>

Thu, 8 Oct 2020 18:51:04 +0000 (14:51 -0400)
author Dessalines <dessalines@users.noreply.github.com>
Thu, 8 Oct 2020 18:51:04 +0000 (14:51 -0400)
committer GitHub <noreply@github.com>
Thu, 8 Oct 2020 18:51:04 +0000 (14:51 -0400)
diff --cc lemmy_apub/src/community.rs
Simple merge
diff --cc lemmy_apub/src/lib.rs
Simple merge
diff --cc lemmy_apub/src/user.rs
Simple merge
author	Dessalines <dessalines@users.noreply.github.com>
	Thu, 8 Oct 2020 18:51:04 +0000 (14:51 -0400)
committer	GitHub <noreply@github.com>
	Thu, 8 Oct 2020 18:51:04 +0000 (14:51 -0400)
		1	2
lemmy_apub/src/community.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lemmy_apub/src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lemmy_apub/src/user.rs	patch \|	diff1 \|	diff2 \|	blob \| history