Merge branch 'develop' into mutes-blocks-pagination

diff --cc CHANGELOG.md
index 216d7bb321e9fabaf64746dcb6d81ff2733aeb4d,05e94581acd7674ead6faab3e1a84b455d213c10..41f0a4402c7ca010e962c1983b5f7accb841c3ce
--- 1/CHANGELOG.md
--- 2/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
  

diff --cc lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge

diff --cc test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
Simple merge