Merge develop

author Roman Chvanikov <chvanikoff@pm.me>

Sun, 13 Sep 2020 09:24:57 +0000 (12:24 +0300)

committer Roman Chvanikov <chvanikoff@pm.me>

Sun, 13 Sep 2020 09:24:57 +0000 (12:24 +0300)
author Roman Chvanikov <chvanikoff@pm.me>
Sun, 13 Sep 2020 09:24:57 +0000 (12:24 +0300)
committer Roman Chvanikov <chvanikoff@pm.me>
Sun, 13 Sep 2020 09:24:57 +0000 (12:24 +0300)
diff --cc config/config.exs
Simple merge
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc lib/pleroma/web/common_api/common_api.ex
Simple merge
diff --cc test/web/common_api/common_api_test.exs
Simple merge
diff --cc test/web/mastodon_api/views/account_view_test.exs
Simple merge
author	Roman Chvanikov <chvanikoff@pm.me>
	Sun, 13 Sep 2020 09:24:57 +0000 (12:24 +0300)
committer	Roman Chvanikov <chvanikoff@pm.me>
	Sun, 13 Sep 2020 09:24:57 +0000 (12:24 +0300)
		1	2
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/common_api/common_api.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/common_api/common_api_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/views/account_view_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history