Merge branch 'develop' into feature/multiple-users-force-password-reset

diff --cc CHANGELOG.md
index 989e0974a64cd32c8a16478073acfdc2a15343d0,77edf7bf0d2897e780013109b3e7e061e853131b..85079512a758309773ba9124bcefa5c17a854b72
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -65,9 -66,9 +66,10 @@@ The format is based on [Keep a Changelo
  - OStatus: Extract RSS functionality
  - Mastodon API: Add `pleroma.direct_conversation_id` to the status endpoint (`GET /api/v1/statuses/:id`)
  - Mastodon API: Mark the direct conversation as read for the author when they send a new direct message
- </details>
  - Deprecated `User.Info` embedded schema (fields moved to `User`)
 +- **Breaking** Admin API: `PATCH /api/pleroma/admin/users/:nickname/force_password_reset` is now `PATCH /api/pleroma/admin/users/force_password_reset` (accepts `nicknames` array in the request body)
+ - Store status data inside Flag activity
+ </details>
  
  ### Fixed
  - Report emails now include functional links to profiles of remote user accounts

diff --cc lib/pleroma/moderation_log.ex
Simple merge

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

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