Merge branch 'develop' into feature/matstodon-statuses-by-name

diff --cc CHANGELOG.md
index 599ea0a72498cf5af9dff4605a3d8afb0735414d,6f268d1101ad5b2f8dbc8e7680a96420bb44c390..da1fa2eac9bd1038fc0e35fa0ef9cd3617a40d41
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -30,7 -31,9 +31,10 @@@ The format is based on [Keep a Changelo
  - Mastodon API, extension: Ability to reset avatar, profile banner, and background
  - Mastodon API: Add support for categories for custom emojis by reusing the group feature. <https://github.com/tootsuite/mastodon/pull/11196>
  - Mastodon API: Add support for muting/unmuting notifications
+ - Mastodon API: Add support for the `blocked_by` attribute in the relationship API (`GET /api/v1/accounts/relationships`). <https://github.com/tootsuite/mastodon/pull/10373>
+ - Mastodon API: Add `pleroma.deactivated` to the Account entity
+ - Mastodon API: added `/auth/password` endpoint for password reset with rate limit.
 +- Mastodon API: /api/v1/accounts/:id/statuses now supports nicknames or user id
  - Admin API: Return users' tags when querying reports
  - Admin API: Return avatar and display name when querying users
  - Admin API: Allow querying user by ID

diff --cc docs/api/differences_in_mastoapi_responses.md
Simple merge

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