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

diff --cc CHANGELOG.md
index e7a60666e962de1e615a536b6e4d406655552276,3a82f7d6c59d2dd858b86a14cb8c9bb765788836..853b3aaae720595dd00cfc7d352982db9206e68a
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,7 -12,11 +12,12 @@@ The format is based on [Keep a Changelo
  - 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`
 +- `[:activitypub, :blockers_visible]` config to control visibility of blockers.
  
  ### Changed
  
@@@ -48,8 -58,11 +59,12 @@@ switched to a new configuration mechani
  
  - Add documented-but-missing chat pagination.
  - Allow sending out emails again.
- - Allow sending chat messages to yourself
+ - Allow sending chat messages to yourself.
+ - Fix remote users with a whitespace name.
+ - OStatus / static FE endpoints: fixed inaccessibility for anonymous users on non-federating instances, switched to handling per `:restrict_unauthenticated` setting.
+ - Mastodon API: Current user is now included in conversation if it's the only participant
+ - Mastodon API: Fixed last_status.account being not filled with account data
 +- See your own post when addressing a user from a blocked domain.
  
  ## 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

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