Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index 0fe84bbd36b35c2a9d7eba3fb8f8098c541526ec,bd06ec866f9bd6a73306601f17a94ea1fb2e07f4..31aa567b666b0ba09338f1dd8a1c58ad112084d7
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -16,7 -16,7 +16,8 @@@ The format is based on [Keep a Changelo
  - 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
+ - Mix task to re-count statuses for all users (`mix pleroma.count_statuses`)
 +- Pleroma API: Add Emoji reactions
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)

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