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

diff --cc CHANGELOG.md
index 1edaed2c8dc527d1f3f55e08693d1e37eb742b85,de017e30aab54b6bf99a59117d97f3aba5c3c817..262a014155b8cfd4a4a0f47e4d9fc95ede08e571
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -48,8 -49,7 +49,9 @@@ The format is based on [Keep a Changelo
  
  ### Added
  
 +- Frontends: Add mix task to install frontends.
 +- Frontends: Add configurable frontends for primary and admin fe.
+ - Configuration: Added a blacklist for email servers.
  - Chats: Added `accepts_chat_messages` field to user, exposed in APIs and federation.
  - Chats: Added support for federated chats. For details, see the docs.
  - ActivityPub: Added support for existing AP ids for instances migrated from Mastodon.

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

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