From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Wed, 28 Oct 2020 11:33:36 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/develop' into feature/account-export
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4a2d7a7a5db2544ffc84e1f0eb0dc86e1cb3c32c;p=akkoma

Merge remote-tracking branch 'origin/develop' into feature/account-export
---

4a2d7a7a5db2544ffc84e1f0eb0dc86e1cb3c32c
diff --cc CHANGELOG.md
index 2f49df2c9,9af4a15cc..23754257c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -13,7 -13,7 +13,8 @@@ The format is based on [Keep a Changelo
  - Pleroma API: Importing the mutes users from CSV files.
  - Experimental websocket-based federation between Pleroma instances.
  - 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.
  
  ### Changed