diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-05-05 14:28:54 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-05-05 14:28:54 +0400 |
| commit | decaa64f75f8bd69622fa5fba757f99719f09808 (patch) | |
| tree | 52d3bfc7318230beae31865c7f0a12e02b7f68b5 /config/config.exs | |
| parent | 764b4f95a8e9e751d5a6136fc2be44d61a082443 (diff) | |
| parent | c297667f16db40654bb16608c01dc4a2dc7c0e4b (diff) | |
| download | pleroma-decaa64f75f8bd69622fa5fba757f99719f09808.tar.gz | |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 7ace09b87..57072d3e6 100644 --- a/config/config.exs +++ b/config/config.exs @@ -564,8 +564,6 @@ 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, |