From: Maxim Filippov <colixer@gmail.com>
Date: Mon, 25 Nov 2019 15:25:43 +0000 (+0900)
Subject: Merge branch 'develop' into feature/admin-api-render-whole-status
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b62be2564c1b3e33e51628e980c5d1ebe259475f;p=akkoma

Merge branch 'develop' into feature/admin-api-render-whole-status
---

b62be2564c1b3e33e51628e980c5d1ebe259475f
diff --cc CHANGELOG.md
index 60512c6b1,e44c892ab..d0ac33b32
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -80,7 -82,7 +83,8 @@@ The format is based on [Keep a Changelo
  
  - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
  - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname`
 +- AdminAPI: If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
+ - Admin API: Error when trying to update reports in the "old" format
  </details>
  
  ## [1.1.6] - 2019-11-19