From cac0bd6d51ac04bb9623d3b8f3a157c0a92291b6 Mon Sep 17 00:00:00 2001 From: kaniini Date: Fri, 24 Aug 2018 18:01:30 +0000 Subject: [PATCH] Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'" This reverts merge request !288 --- config/config.exs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/config.exs b/config/config.exs index f89dd86f7..839e6bde6 100644 --- a/config/config.exs +++ b/config/config.exs @@ -76,8 +76,7 @@ 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,