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

Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md
---

d7f9679ff2c9c4bd2b9967d7a32b5a4fe145305e
diff --cc CHANGELOG.md
index 0fe84bbd3,bd06ec866..31aa567b6
--- a/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)