Merge branch 'develop' into 'feature/custom-runtime-modules'

# Conflicts:
#   CHANGELOG.md

diff --combined CHANGELOG.md
index 5528845d64df15bfc180c347419010398ce0ddbd,4b1fdcdce2b8b652a6b9532d1d04a655bf372c15..20b8de8876d0af27fe6407c64e5d4397774bb0ea
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -37,6 -37,7 +37,7 @@@ The format is based on [Keep a Changelo
  - Mastodon API: Mark the direct conversation as read for the author when they send a new direct message
  - Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
  - Admin API: Render whole status in grouped reports
+ - Mastodon API: User timelines will now respect blocks, unless you are getting the user timeline of somebody you blocked (which would be empty otherwise).
  </details>
  
  ### Added
@@@ -49,7 -50,7 +50,8 @@@
  - Support for `X-Forwarded-For` and similar HTTP headers which used by reverse proxies to pass a real user IP address to the backend. Must not be enabled unless your instance is behind at least one reverse proxy (such as Nginx, Apache HTTPD or Varnish Cache).
  - MRF: New module which handles incoming posts based on their age. By default, all incoming posts that are older than 2 days will be unlisted and not shown to their followers.
  - User notification settings: Add `privacy_option` option.
 +- Support for custom Elixir modules (such as MRF policies)
+ - User settings: Add _This account is a_ option.
  <details>
    <summary>API Changes</summary>
  
@@@ -78,6 -79,9 +80,9 @@@
  - Pleroma API: Add Emoji reactions
  - Admin API: Add `/api/pleroma/admin/instances/:instance/statuses` - lists all statuses from a given instance
  - Admin API: `PATCH /api/pleroma/users/confirm_email` to confirm email for multiple users, `PATCH /api/pleroma/users/resend_confirmation_email` to resend confirmation email for multiple users
+ - ActivityPub: Configurable `type` field of the actors.
+ - Mastodon API: `/api/v1/accounts/:id` has `source/pleroma/actor_type` field.
+ - Mastodon API: `/api/v1/update_credentials` accepts `actor_type` field.
  </details>
  
  ### Fixed