From: lain <lain@soykaf.club>
Date: Mon, 7 Oct 2019 12:31:51 +0000 (+0000)
Subject: Merge branch 'develop' into 'reactions'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6c278cfe09fb9fd5220743d8f69c6e232623a09b;p=akkoma

Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md
---

6c278cfe09fb9fd5220743d8f69c6e232623a09b
diff --cc CHANGELOG.md
index 2cc0cee93,f193ec1ff..0fe84bbd3
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -15,7 -15,7 +15,8 @@@ The format is based on [Keep a Changelo
  - 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
 +- Pleroma API: Add Emoji reactions
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)