Merge branch 'develop' into feature/expire-mutes

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/api_spec/operations/account_operation.ex
Simple merge

diff --cc lib/pleroma/web/api_spec/operations/status_operation.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