Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak

diff --cc CHANGELOG.md
index 150cd4147e542631918fc30f59f6b0ce545764a1,5bb4b1e7370f6d7b5cfb0777ae06343de9783ec9..61eeb078628eb9ccb30636f9583a71c37c1620ba
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -25,7 -28,7 +28,8 @@@ The format is based on [Keep a Changelo
  - Applying ConcurrentLimiter settings via AdminAPI
  - User login failures if their `notification_settings` were in a NULL state.
  - Mix task `pleroma.user delete_activities` query transaction timeout is now :infinity
 +- MRF (`SimplePolicy`): Embedded objects are now checked. If any embedded object would be rejected, its parent is rejected. This fixes Announces leaking posts from blocked domains.
+ - Fixed some Markdown issues, including trailing slash in links.
  
  ## [2.3.0] - 2020-03-01