Merge branch 'develop' into refactor/notification_settings

diff --combined CHANGELOG.md
index 4af195f7dd2d1f73f9fe0181a19447a96817fbbf,b1a420b49058c76d1cbbaed299f80abb6a425bbc..a02f28241b202c394a79dd7d83b2a4b8534b7b7d
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,6 -12,7 +12,7 @@@ The format is based on [Keep a Changelo
  - MFR policy to set global expiration for all local Create activities
  - OGP rich media parser merged with TwitterCard
  - Configuration: `:instance, rewrite_policy` moved to `:mrf, policies`, `:instance, :mrf_transparency` moved to `:mrf, :transparency`, `:instance, :mrf_transparency_exclusions` moved to `:mrf, :transparency_exclusions`. Old config namespace is deprecated.
+ - Configuration: `:media_proxy, whitelist` format changed to host with scheme (e.g. `http://example.com` instead of `example.com`). Domain format is deprecated.
  
  <details>
    <summary>API Changes</summary>
@@@ -24,10 -25,6 +25,10 @@@
  - Mastodon API: Added `pleroma.metadata.fields_limits` to /api/v1/instance
  - Mastodon API: On deletion, returns the original post text.
  - Mastodon API: Add `pleroma.unread_count` to the Marker entity.
 +- **Breaking:** Notification Settings API for suppressing notifications
 +  has been simplified down to `block_from_strangers`.
 +- **Breaking:** Notification Settings API option for hiding push notification
 +  contents has been renamed to `hide_notification_contents`
  </details>
  
  <details>