Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance

diff --cc CHANGELOG.md
index 66644efc9c41989facfacdbd3ba490938c2c6983,b4ad91b0d774c6f4843139779f8912310e37f4a4..b4e013cdd5debe1ae430c531a515fd9e8fdb9e03
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -60,7 -66,7 +66,8 @@@ The format is based on [Keep a Changelo
  - Mastodon API: Add `/api/v1/markers` for managing timeline read markers
  - Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
  - Configuration: `feed` option for user atom feed.
+ - Pleroma API: Add Emoji reactions
 +- Admin API: Add `/api/pleroma/admin/instances/:instance/statuses` - lists all statuses from a given instance
  </details>
  
  ### Fixed

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

diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
index 1e2982b678dc136c64b668bca974b28d472e530f,9b8b373b829b0f49ca91f943b8df26a6eb80c47a..9eadb45913dedab29a3b366a4c94a6e80942801c
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -177,11 -177,10 +177,12 @@@ defmodule Pleroma.Web.Router d
      get("/users/:nickname", AdminAPIController, :user_show)
      get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses)
  
 +    get("/instances/:instance/statuses", AdminAPIController, :list_instance_statuses)
 +
      get("/reports", AdminAPIController, :list_reports)
+     get("/grouped_reports", AdminAPIController, :list_grouped_reports)
      get("/reports/:id", AdminAPIController, :report_show)
-     put("/reports/:id", AdminAPIController, :report_update_state)
+     patch("/reports", AdminAPIController, :reports_update)
      post("/reports/:id/respond", AdminAPIController, :report_respond)
  
      put("/statuses/:id", AdminAPIController, :status_update)

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