[#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming...

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index 85d077e3f7bca075de6f3a5788604285aecf725f,663d99ffd32848b9bc091d3a0d48c5d10d389855..5a6c5ebb403256faed8de312cfd4a3bc07556b2f
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,7 -6,13 +6,14 @@@ 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)
+ 
+ ### Fixed
+ - Not being able to pin unlisted posts
+ 
+ ### Changed
+ - Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text
  
  ## [1.0.0] - 2019-06-29
  ### Security

diff --cc docs/config.md
Simple merge