projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/2.4.1' into chores/2.4.1-develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 2f8a18788cfc0329a01b49951bb304380a9982bb..828fe00857518594c69495ae44f705c9debd8b71 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-460,7
+460,7
@@
config :pleroma, :shout,
enabled: true,
limit: 5_000
enabled: true,
limit: 5_000
-config :phoenix, :format_encoders, json: Jason
+config :phoenix, :format_encoders, json: Jason
, "activity+json": Jason
config :phoenix, :json_library, Jason
config :phoenix, :json_library, Jason
@@
-560,6
+560,7
@@
config :pleroma, Oban,
mailer: 10,
transmogrifier: 20,
scheduled_activities: 10,
mailer: 10,
transmogrifier: 20,
scheduled_activities: 10,
+ poll_notifications: 10,
background: 5,
remote_fetcher: 2,
attachments_cleanup: 1,
background: 5,
remote_fetcher: 2,
attachments_cleanup: 1,