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

diff --cc CHANGELOG.md
index 2f49df2c9e21519ed408b6490c181aeb7cfe3f61,9af4a15cccde2f0543de5fbe5488cbe52c1dc1cc..23754257cb209036fd987a721c4a19bbea5c8294
--- 1/CHANGELOG.md
--- 2/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
  

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
Simple merge