Merge pull request #1874 from LemmyNet/protocol-testing

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

Wed, 3 Nov 2021 15:23:26 +0000 (11:23 -0400)

committer GitHub <noreply@github.com>

Wed, 3 Nov 2021 15:23:26 +0000 (11:23 -0400)
author Dessalines <dessalines@users.noreply.github.com>
Wed, 3 Nov 2021 15:23:26 +0000 (11:23 -0400)
committer GitHub <noreply@github.com>
Wed, 3 Nov 2021 15:23:26 +0000 (11:23 -0400)
diff --cc Cargo.lock
Simple merge
diff --cc crates/api/Cargo.toml
Simple merge
author	Dessalines <dessalines@users.noreply.github.com>
	Wed, 3 Nov 2021 15:23:26 +0000 (11:23 -0400)
committer	GitHub <noreply@github.com>
	Wed, 3 Nov 2021 15:23:26 +0000 (11:23 -0400)
		1	2
Cargo.lock	patch \|	diff1 \|	diff2 \|	blob \| history
crates/api/Cargo.toml	patch \|	diff1 \|	diff2 \|	blob \| history