diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-04-20 10:13:56 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-04-20 10:15:40 -0500 |
| commit | bedc558809832ce6ef6063fe91656a0fff0e222c (patch) | |
| tree | f844a11ae25f1866bffb79d9eaf0d66aa2babcd6 /config/config.exs | |
| parent | b54c8813d632cb44c7deb207e91bd32f01f33794 (diff) | |
| parent | 28165dad3ac02a6d3ba4b0cda51992a1831515dd (diff) | |
| download | pleroma-bedc558809832ce6ef6063fe91656a0fff0e222c.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into accept-deletes
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 9a6b93a37..2e538c4be 100644 --- a/config/config.exs +++ b/config/config.exs @@ -240,6 +240,8 @@ config :pleroma, :instance, extended_nickname_format: true, cleanup_attachments: false +config :pleroma, :extensions, output_relationships_in_statuses_by_default: true + config :pleroma, :feed, post_title: %{ max_length: 100, @@ -560,6 +562,8 @@ config :pleroma, :email_notifications, inactivity_threshold: 7 } +config :pleroma, :notifications, enable_follow_request_notifications: false + config :pleroma, :oauth2, token_expires_in: 600, issue_new_refresh_token: true, |