Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index 2cc0cee930661cbe17e97b17b6ff1a66f56dc2e7,f193ec1ff30b95e2039f1473cd09effcd37e6942..0fe84bbd36b35c2a9d7eba3fb8f8098c541526ec
--- 1/CHANGELOG.md
--- 2/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)

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