Merge branch 'develop' into feature/reports-groups-and-multiple-state-update

diff --cc CHANGELOG.md
index 7956a6527fa958715d24cc2c8edda8e11bf74d32,f193ec1ff30b95e2039f1473cd09effcd37e6942..3c306980b65a4caeffdaeae9564bc30f4a341474
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -11,7 -12,10 +12,11 @@@ The format is based on [Keep a Changelo
  - Pleroma API: `GET /api/v1/pleroma/accounts/:id/scrobbles` to get a list of recently scrobbled items
  - Pleroma API: `POST /api/v1/pleroma/scrobble` to scrobble a media item
  - Mastodon API: Add `upload_limit`, `avatar_upload_limit`, `background_upload_limit`, and `banner_upload_limit` to `/api/v1/instance`
+ - Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
+ - OAuth: support for hierarchical permissions / [Mastodon 2.4.3 OAuth permissions](https://docs.joinmastodon.org/api/permissions/)
+ - Authentication: Added rate limit for password-authorized actions / login existence checks
+ - Metadata Link: Atom syndication Feed
 +- Admin API: Add ability to fetch reports, grouped by status `GET /api/pleroma/admin/grouped_reports`
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)

diff --cc docs/API/admin_api.md
Simple merge

diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge

diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/common_api/common_api.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
Simple merge

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