From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 29 Oct 2020 10:51:23 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8542d2efee86131350736a9be96713551e01f6ed;p=akkoma

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

8542d2efee86131350736a9be96713551e01f6ed
diff --cc CHANGELOG.md
index 361ad5038,03fe51f9d..d2f536da8
--- a/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.