From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 7 May 2021 17:40:45 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=cea44b6b3ebac3976699d2460ae53d8506b86445;p=akkoma

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

cea44b6b3ebac3976699d2460ae53d8506b86445
diff --cc CHANGELOG.md
index 150cd4147,5bb4b1e73..61eeb0786
--- a/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