diff options
| author | lain <lain@soykaf.club> | 2020-05-03 12:55:29 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-03 12:55:29 +0200 |
| commit | 6fb96f64c13597bcf8d10f30442ac61610cec58e (patch) | |
| tree | 29db6b5d77a562dd496618ebcd54c15574f093a8 /config/config.exs | |
| parent | 4dfc617cdf1c2579f4f941dcd0fa5c728178df06 (diff) | |
| parent | 095635453ac58b9e01a32ad226c0b61466c16da0 (diff) | |
| download | pleroma-6fb96f64c13597bcf8d10f30442ac61610cec58e.tar.gz pleroma-6fb96f64c13597bcf8d10f30442ac61610cec58e.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
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 2e538c4be..a6c6d6f99 100644 --- a/config/config.exs +++ b/config/config.exs @@ -562,8 +562,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, |