hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into global-status-expiration

Browse source
This commit is contained in:
Egor Kislitsyn 2020-05-05 14:28:54 +04:00
commit decaa64f75
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
244 changed files with 6395 additions and 2717 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -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,