projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 17770640a92f6833e5a670026a75ef4c53f455bf..bf497031408fd52b33c964801e000855a8e5e1a0 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-302,7
+302,6
@@
config :pleroma, :assets,
default_mascot: :pleroma_fox_tan
config :pleroma, :activitypub,
default_mascot: :pleroma_fox_tan
config :pleroma, :activitypub,
- accept_blocks: true,
unfollow_blocked: true,
outgoing_blocks: true,
follow_handshake_timeout: 500,
unfollow_blocked: true,
outgoing_blocks: true,
follow_handshake_timeout: 500,
@@
-514,6
+513,14
@@
config :pleroma, Pleroma.ScheduledActivity,
total_user_limit: 300,
enabled: true
total_user_limit: 300,
enabled: true
+config :pleroma, :email_notifications,
+ digest: %{
+ active: false,
+ schedule: "0 0 * * 0",
+ interval: 7,
+ inactivity_threshold: 7
+ }
+
config :pleroma, :oauth2,
token_expires_in: 600,
issue_new_refresh_token: true,
config :pleroma, :oauth2,
token_expires_in: 600,
issue_new_refresh_token: true,