From: Ivan Tashkinov <ivant.business@gmail.com>
Date: Sat, 6 Jul 2019 07:17:06 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ad8d86e7c600bca65e5f0bb407651d33f1e53043;p=akkoma

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

ad8d86e7c600bca65e5f0bb407651d33f1e53043
diff --cc CHANGELOG.md
index 5a6c5ebb4,3dbbd8225..852e7e2c4
--- a/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