Merge branch 'follow-request-notifications' into 'develop'

Follow request notifications enforcement

See merge request pleroma/pleroma!2451
This commit is contained in:
rinpatch 2020-05-02 12:24:49 +00:00
commit c75840f7b8
4 changed files with 11 additions and 44 deletions

View file

@ -581,8 +581,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,