commit: 265fba7e01d959140ef72913e5f7b9069d6e7d49
parent: 8b9fe0c7a167173b6ad2c735e30a60c55840f26d
Author: kaniini <nenolod@gmail.com>
Date: Fri, 24 Aug 2018 17:40:55 +0000
Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'
add collapseMessageWithSubject in config
See merge request pleroma/pleroma!288
Diffstat:
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/config/config.exs b/config/config.exs
@@ -76,7 +76,8 @@ 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
+ scope_options_enabled: false,
+ collapseMessageWithSubject: false
config :pleroma, :activitypub,
accept_blocks: true,