Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies...

diff --cc CHANGELOG.md
index 5a6c5ebb403256faed8de312cfd4a3bc07556b2f,3dbbd822579e1266c2a1e78f8b03b81c8316cafa..852e7e2c4ae669132e3165b9e6ed84ed2b53a180
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,8 -6,9 +6,10 @@@ The format is based on [Keep a Changelo
  ## [Unreleased]
  ### Added
  - MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`)
 +- Federation: Support for restricting max. reply-to depth on fetching 
  - Mastodon API: Support for the [`tagged` filter](https://github.com/tootsuite/mastodon/pull/9755) in [`GET /api/v1/accounts/:id/statuses`](https://docs.joinmastodon.org/api/rest/accounts/#get-api-v1-accounts-id-statuses)
+ - Admin API: Return users' tags when querying reports
+ - Admin API: Return avatar and display name when querying users
  
  ### Fixed
  - Not being able to pin unlisted posts