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

diff --cc CHANGELOG.md
index 60512c6b11f5a4066c18c303d68a783bff923596,e44c892abd87d6c83fc06ccf2f2309b1ce564cba..d0ac33b32abc12d0cbf93d4b68ffa5b17210fc80
--- 1/CHANGELOG.md
--- 2/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

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

diff --cc test/web/admin_api/admin_api_controller_test.exs
Simple merge