Merge branch 'develop' into refactor/notification_settings

diff --cc CHANGELOG.md
index 1d640f2922bc4b0f65fc3ce7c958a8193660f8ce,5fed80a99e08775e4fdecbbfca297a964b311aea..4af195f7dd2d1f73f9fe0181a19447a96817fbbf
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -16,11 -16,14 +16,18 @@@ The format is based on [Keep a Changelo
  <details>
    <summary>API Changes</summary>
  
+ - **Breaking:** Pleroma API: The routes to update avatar, banner and background have been removed.
+ - **Breaking:** Image description length is limited now.
  - **Breaking:** Emoji API: changed methods and renamed routes.
+ - MastodonAPI: Allow removal of avatar, banner and background.
+ - Streaming: Repeats of a user's posts will no longer be pushed to the user's stream.
+ - 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>

diff --cc lib/pleroma/notification.ex
index 8a28a182144ad3748fb97b799221830a8408a8c4,32bcfcaba34d9c830211c3f8180481feff193b5d..0b171563b291873000182e7345711fb2939fc1d5
--- 1/lib/pleroma/notification.ex
--- 2/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@@ -550,8 -571,12 +571,9 @@@ defmodule Pleroma.Notification d
      [
        :self,
        :invisible,
 -      :followers,
 -      :follows,
 -      :non_followers,
 -      :non_follows,
 +      :block_from_strangers,
-       :recently_followed
+       :recently_followed,
+       :filtered
      ]
      |> Enum.find(&skip?(&1, activity, user))
    end

diff --cc lib/pleroma/web/api_spec/schemas/account.ex
Simple merge

diff --cc test/notification_test.exs
Simple merge

diff --cc test/web/mastodon_api/views/account_view_test.exs
Simple merge

diff --cc test/web/twitter_api/util_controller_test.exs
Simple merge