From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Mon, 7 Oct 2019 08:06:30 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=28fb98d69e31ce5a09e15e213491b880430a0902;p=akkoma

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

# Conflicts:
#	CHANGELOG.md
---

28fb98d69e31ce5a09e15e213491b880430a0902
diff --cc CHANGELOG.md
index b7178889f,1c7f93926..e2d6d6950
--- a/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)