projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'feature/nicer-safe-render-errors' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index d2325edbc15e0f731610f1985cccc7b1714d6bcd..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,
- accept_blocks: true,
unfollow_blocked: true,
outgoing_blocks: true,
follow_handshake_timeout: 500,