Merge branch 'delete-account-fix' into 'develop'

author lain <lain@soykaf.club>

Wed, 15 Dec 2021 21:26:45 +0000 (21:26 +0000)

committer lain <lain@soykaf.club>

Wed, 15 Dec 2021 21:26:45 +0000 (21:26 +0000)
author lain <lain@soykaf.club>
Wed, 15 Dec 2021 21:26:45 +0000 (21:26 +0000)
committer lain <lain@soykaf.club>
Wed, 15 Dec 2021 21:26:45 +0000 (21:26 +0000)
diff --cc lib/pleroma/web/api_spec/operations/twitter_util_operation.ex
Simple merge
diff --cc test/pleroma/web/twitter_api/util_controller_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Wed, 15 Dec 2021 21:26:45 +0000 (21:26 +0000)
committer	lain <lain@soykaf.club>
	Wed, 15 Dec 2021 21:26:45 +0000 (21:26 +0000)
		1	2
lib/pleroma/web/api_spec/operations/twitter_util_operation.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/twitter_api/util_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history