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

diff --cc CHANGELOG.md
index bb4c6d38382003f1eaf1b88b6b84a60021c099c6,afeaa930bb8591454b8d7b646baef95d749c83a7..e7a60666e962de1e615a536b6e4d406655552276
--- 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.
 +- `[:activitypub, :blockers_visible]` config to control visibility of blockers.
  
  ### Changed
  
@@@ -49,7 -47,7 +48,8 @@@ switched to a new configuration mechani
  
  - Add documented-but-missing chat pagination.
  - Allow sending out emails again.
 +- See your own post when addressing a user from a blocked domain.
+ - Allow sending chat messages to yourself
  
  ## Unreleased (Patch)
  

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

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

diff --cc test/pleroma/web/activity_pub/activity_pub_test.exs
Simple merge