From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 8 Sep 2020 14:31:26 +0000 (-0500)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=21efda2edbfa74e80ad0df6f92b52a16880082e3;hp=--cc;p=akkoma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
---

21efda2edbfa74e80ad0df6f92b52a16880082e3
diff --cc CHANGELOG.md
index 1b1ea02ac,75442b5f0..f57e191fa
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,6 -19,6 +19,7 @@@ The format is based on [Keep a Changelo
  ### Added
  
  - Rich media failure tracking (along with `:failure_backoff` option)
++- MRF policy to rewrite bot posts scope from public to unlisted
  
  ### Fixed