projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
265fba7
)
Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"
author
kaniini
<nenolod@gmail.com>
Fri, 24 Aug 2018 18:01:30 +0000
(18:01 +0000)
committer
kaniini
<nenolod@gmail.com>
Fri, 24 Aug 2018 18:01:30 +0000
(18:01 +0000)
This reverts merge request !288
config/config.exs
patch
|
blob
|
history
diff --git
a/config/config.exs
b/config/config.exs
index f89dd86f76f57f218ae7810e103de894bc71f01e..839e6bde650440bc987f3a9cb58010541a62c235 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-76,8
+76,7
@@
config :pleroma, :fe,
who_to_follow_provider:
"https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}",
who_to_follow_link: "https://vinayaka.distsn.org/?{{host}}+{{user}}",
- scope_options_enabled: false,
- collapseMessageWithSubject: false
+ scope_options_enabled: false
config :pleroma, :activitypub,
accept_blocks: true,