Merge branch 'develop' into refactor/locked_user_field

diff --cc lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge

diff --cc test/mix/tasks/pleroma/user_test.exs
Simple merge

diff --cc test/pleroma/notification_test.exs
Simple merge

diff --cc test/pleroma/user_test.exs
Simple merge

diff --cc test/pleroma/web/activity_pub/activity_pub_test.exs
Simple merge

diff --cc test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs
Simple merge

diff --cc test/pleroma/web/activity_pub/transmogrifier/follow_handling_test.exs
Simple merge

diff --cc test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs
Simple merge

diff --cc test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs
Simple merge

diff --cc test/pleroma/web/activity_pub/utils_test.exs
Simple merge

diff --cc test/pleroma/web/common_api_test.exs
Simple merge

diff --cc test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
Simple merge

diff --cc test/pleroma/web/mastodon_api/controllers/follow_request_controller_test.exs
Simple merge

diff --cc test/pleroma/web/mastodon_api/update_credentials_test.exs
Simple merge

diff --cc test/pleroma/web/mastodon_api/views/account_view_test.exs
Simple merge