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

# Conflicts:
#	CHANGELOG.md

diff --combined 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 --combined docs/config.md
index b401474817aabcaf6dabc6689b5ed528278809f3,8afccb228d7ca9991fd4998d365a2b71102eada8..6cbbb6ce96a5dbb9bab06d82a4b5d6d08ff69018
--- 1/docs/config.md
--- 2/docs/config.md
+++ b/docs/config.md
@@@ -36,7 -36,7 +36,7 @@@ No specific configuration
  This filter replaces the filename (not the path) of an upload. For complete obfuscation, add
  `Pleroma.Upload.Filter.Dedupe` before AnonymizeFilename.
  
- * `text`: Text to replace filenames in links. If empty, `{random}.extension` will be used.
+ * `text`: Text to replace filenames in links. If empty, `{random}.extension` will be used. You can get the original filename extension by using `{extension}`, for example `custom-file-name.{extension}`.
  
  ## Pleroma.Emails.Mailer
  * `adapter`: one of the mail adapters listed in [Swoosh readme](https://github.com/swoosh/swoosh#adapters), or `Swoosh.Adapters.Local` for in-memory mailbox.
@@@ -87,7 -87,6 +87,7 @@@ config :pleroma, Pleroma.Emails.Mailer
  * `invites_enabled`: Enable user invitations for admins (depends on `registrations_open: false`).
  * `account_activation_required`: Require users to confirm their emails before signing in.
  * `federating`: Enable federation with other instances
 +* `federation_incoming_replies_max_depth`: Max. depth of reply-to activities fetching on incoming federation (to prevent memory leakage on extremely nested incoming threads). If set to `nil`, threads of any depth will be fetched.
  * `federation_reachability_timeout_days`: Timeout (in days) of each external federation target being unreachable prior to pausing federating to it.
  * `allow_relay`: Enable Pleroma’s Relay, which makes it possible to follow a whole instance
  * `rewrite_policy`: Message Rewrite Policy, either one or a list. Here are the ones available by default: