Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned...

# Conflicts:
#	docs/config.md

diff --cc docs/config.md
index f1bb8d86c5a5735283b2ecdc4b6e5e898a5af016,1a9706f5b8fe1dbddfca60b15fe7a74b300d42d0..7eb2d567125f3c0f5993e9d02347d6b3d449d822
--- 1/docs/config.md
--- 2/docs/config.md
+++ b/docs/config.md
@@@ -32,7 -32,7 +32,7 @@@ This filter replaces the filename (not 
  
  ## Pleroma.Mailer
  * `adapter`: one of the mail adapters listed in [Swoosh readme](https://github.com/swoosh/swoosh#adapters), or `Swoosh.Adapters.Local` for in-memory mailbox.
--* `api_key` / `password` and / or other adapter-specific settings, per the above documentation. 
++* `api_key` / `password` and / or other adapter-specific settings, per the above documentation.
  
  An example for Sendgrid adapter:
  
@@@ -93,7 -93,7 +93,8 @@@ config :pleroma, Pleroma.Mailer
  * `always_show_subject_input`: When set to false, auto-hide the subject field when it's empty.
  * `extended_nickname_format`: Set to `true` to use extended local nicknames format (allows underscores/dashes). This will break federation with
      older software for theses nicknames.
 +* `max_pinned_statuses`: The maximum number of pinned statuses. `0` will disable the feature.
+ * `autofollowed_nicknames`: Set to nicknames of (local) users that every new user should automatically follow.
  
  ## :logger
  * `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog

diff --cc lib/pleroma/user/info.ex
Simple merge