From: Maxim Filippov <colixer@gmail.com>
Date: Thu, 10 Oct 2019 00:33:55 +0000 (+0300)
Subject: Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=24eecc3cb4a35376124b1fc792183d8b8dd0a9cc;p=akkoma

Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
---

24eecc3cb4a35376124b1fc792183d8b8dd0a9cc
diff --cc CHANGELOG.md
index 3c306980b,bd06ec866..c51807c80
--- 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`)
 +- Admin API: Add ability to fetch reports, grouped by status `GET /api/pleroma/admin/grouped_reports`
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)