From: lain <lain@soykaf.club>
Date: Tue, 4 Aug 2020 13:10:36 +0000 (+0200)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles... 
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=532d6f94aea5d4f53e846b8b77296f80a9ae68a0;p=akkoma

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

532d6f94aea5d4f53e846b8b77296f80a9ae68a0
diff --cc CHANGELOG.md
index 1edaed2c8,de017e30a..262a01415
--- a/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.