From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Tue, 8 Jan 2019 09:32:07 +0000 (+0700)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0c750bc432a6329be7f0dc15707e46625b11faf3;p=akkoma

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

0c750bc432a6329be7f0dc15707e46625b11faf3
diff --cc docs/config.md
index c903b53bf,e3b2fb35c..f1bb8d86c
--- a/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.