Merge branch 'develop' into issue/1276

diff --cc CHANGELOG.md
index 4a2296cdd071107c308b4a842494d497c3d2ea2d,4d626a6836e4660592b266e194a7f0aec979ccf5..bd18073932d894161e86192c7c10639fe06d03ee
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -36,8 -44,9 +44,10 @@@ The format is based on [Keep a Changelo
  - Mastodon API: `pleroma.thread_muted` to the Status entity
  - 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.
 +- Mastodon API: Add `pleroma.unread_count` to the Marker entity
  - 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).
+ - Mastodon API: Favoriting / Repeating a post multiple times will now return the identical response every time. Before, executing that action twice would return an error ("already favorited") on the second try.
  </details>
  
  ### Added

diff --cc docs/API/differences_in_mastoapi_responses.md
Simple merge

diff --cc lib/pleroma/notification.ex
Simple merge

diff --cc test/notification_test.exs
Simple merge