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

diff --cc CHANGELOG.md
index 1b1ea02ac2444b9668e7fb00b6949ecbd9a35a6c,75442b5f0d9d0a7e56cb639b11753ff7045116af..f57e191fa63f5869c564119c10c7d06f32938b19
--- 1/CHANGELOG.md
--- 2/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
  

diff --cc config/description.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
Simple merge