Merge pull request #1535 from LemmyNet/rust_captcha_features

author Nutomic <me@nutomic.com>

Tue, 6 Apr 2021 11:58:48 +0000 (11:58 +0000)

committer GitHub <noreply@github.com>

Tue, 6 Apr 2021 11:58:48 +0000 (11:58 +0000)
author Nutomic <me@nutomic.com>
Tue, 6 Apr 2021 11:58:48 +0000 (11:58 +0000)
committer GitHub <noreply@github.com>
Tue, 6 Apr 2021 11:58:48 +0000 (11:58 +0000)
diff --cc crates/api/src/local_user.rs
Simple merge
diff --cc crates/api_common/src/person.rs
Simple merge
author	Nutomic <me@nutomic.com>
	Tue, 6 Apr 2021 11:58:48 +0000 (11:58 +0000)
committer	GitHub <noreply@github.com>
	Tue, 6 Apr 2021 11:58:48 +0000 (11:58 +0000)
		1	2
crates/api/src/local_user.rs	patch \|	diff1 \|	diff2 \|	blob \| history
crates/api_common/src/person.rs	patch \|	diff1 \|	diff2 \|	blob \| history