projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete...
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 2e538c4be7dfa9ad622b15735e7a70db788fd5b3..a6c6d6f99e7c593caffe00062d61671eea94d121 100644
(file)
--- 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,