From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 19 Jul 2019 21:55:10 +0000 (-0500)
Subject: Merge branch 'develop' into feature/matstodon-statuses-by-name
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=9169f331b6d481a0aa2b0bfe91500d695fb1b6d6;p=akkoma

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

9169f331b6d481a0aa2b0bfe91500d695fb1b6d6
diff --cc CHANGELOG.md
index 599ea0a72,6f268d110..da1fa2eac
--- a/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