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

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index 4ae1079fe89d7a54d4fc041262222fc4beb1a5fb,db505591b703264ffef0dd1da291316d6634a46a..b7178889fe97a6d362e7822fd3e9ca3c087b077c
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -10,6 -11,8 +11,9 @@@ The format is based on [Keep a Changelo
  - Mastodon API: Account entities now include `follow_requests_count` (planned Mastodon 3.x addition)
  - 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
++- Authentication: Added rate limit for password-authorized actions / login existence checks
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)

diff --cc config/config.exs
Simple merge

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