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

diff --cc docs/config.md
index c903b53bf3c1283e6c6c32a67efa1809e98c28a2,e3b2fb35cf82f09938cd7486d405df87f9ebf32a..f1bb8d86c5a5735283b2ecdc4b6e5e898a5af016
--- 1/docs/config.md
--- 2/docs/config.md
+++ b/docs/config.md
@@@ -93,8 -93,11 +93,12 @@@ 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.
  
+ ## :logger
+ * `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog
+ See: [logger’s documentation](https://hexdocs.pm/logger/Logger.html) and [ex_syslogger’s documentation](https://hexdocs.pm/ex_syslogger/)
+ 
  ## :fe
  This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:instance`` is set to false.