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

diff --cc CHANGELOG.md
index 0eeffb72fdb81cf47ce619fb10e776ea675555ca,2ee17d239dde32fbb707d3bc3dd47c4fc32d57af..8358eb9da81be3039711c03e1d986445ffe1cc70
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -9,7 -9,13 +9,14 @@@ 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
+ - App metrics: ability to restrict access to specified IP whitelist.
+ - Account backup
+ - Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
 +- Ability to view remote timelines, with ex. `/api/v1/timelines/public?instance=lain.com` and streams `public:remote` and `public:remote:media`
  
  ### Changed
  

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
Simple merge

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

diff --cc test/pleroma/web/streamer_test.exs
Simple merge