Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth...

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index b7178889fe97a6d362e7822fd3e9ca3c087b077c,1c7f93926e561f1d4360d68145c80f5dc4aeb8a0..e2d6d695045fc946a18202629db5f2b0de70cc57
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -13,7 -13,7 +13,8 @@@ The format is based on [Keep a Changelo
  - 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
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)

diff --cc lib/pleroma/web/oauth/oauth_controller.ex
Simple merge