Merge remote-tracking branch 'origin/develop' into feature/local-only-scope

diff --cc CHANGELOG.md
index 361ad503887be36bd8a99f290d824078cc66d064,03fe51f9db97bfde77e9e2a7774133bc295f0425..d2f536da8379d86d1400e74555e649a6d75efb87
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,10 -12,9 +12,11 @@@ 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 for local-only statuses
  - App metrics: ability to restrict access to specified IP whitelist.
+ - Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
  
 +
  ### Changed
  
  - **Breaking** Requires `libmagic` (or `file`) to guess file types.

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