From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 19 Oct 2020 11:40:03 +0000 (+0400)
Subject: Merge branch 'develop' into mutes-blocks-pagination
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f;p=akkoma

Merge branch 'develop' into mutes-blocks-pagination
---

76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f
diff --cc CHANGELOG.md
index 216d7bb32,05e94581a..41f0a4402
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -9,7 -9,9 +9,10 @@@ The format is based on [Keep a Changelo
  - Mix tasks for controlling user account confirmation status in bulk (`mix pleroma.user confirm_all` and `mix pleroma.user unconfirm_all`)
  - Mix task for sending confirmation emails to all unconfirmed users (`mix pleroma.email send_confirmation_mails`)
  - Mix task option for force-unfollowing relays
+ - Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details).
+ - Pleroma API: Importing the mutes users from CSV files.
+ - Experimental websocket-based federation between Pleroma instances.
 +- Support pagination of blocks and mutes
  
  ### Changed