Merge branch 'develop' into 'feature/autofollowing'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index fd5b9034ddd82463cd813057f2b0f4488b260900,afeaa930bb8591454b8d7b646baef95d749c83a7..ced8a2d5f40ea774dc00514fa744b9500c153740
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -9,7 -9,9 +9,11 @@@ The format is based on [Keep a Changelo
  - Mix tasks for controlling user account confirmation status in bulk (`mix pleroma.user confirm_all` and `mix pleroma.user unconfirm_all`)
  - Mix task for sending confirmation emails to all unconfirmed users (`mix pleroma.email send_confirmation_mails`)
  - Mix task option for force-unfollowing relays
- - Setting `:instance, autofollowing_nicknames` to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
+ - 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.
++- 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
index 79e1368d025d99b7d23818bfbdacdcb9d2f1978d,0da1da57d85a55b35ef9f8e0a712b3e52ab37a90..1c300cc45949fe402a24bceb7ab12ef3361c66fd
--- 1/config/description.exs
--- 2/config/description.exs
+++ b/config/description.exs
@@@ -829,20 -829,8 +829,14 @@@ config :pleroma, :config_description, 
          key: :autofollowed_nicknames,
          type: {:list, :string},
          description:
-           "Set to nicknames of (local) users that every new user should automatically follow",
-         suggestions: [
-           "lain",
-           "kaniini",
-           "lanodan",
-           "rinpatch"
-         ]
+           "Set to nicknames of (local) users that every new user should automatically follow"
        },
 +      %{
 +        key: :autofollowing_nicknames,
 +        type: {:list, :string},
 +        description:
 +          "Set to nicknames of (local) users that automatically follows every newly registered user"
 +      },
        %{
          key: :attachment_links,
          type: :boolean,