logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: cac0bd6d51ac04bb9623d3b8f3a157c0a92291b6
parent: 265fba7e01d959140ef72913e5f7b9069d6e7d49
Author: kaniini <nenolod@gmail.com>
Date:   Fri, 24 Aug 2018 18:01:30 +0000

Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"

This reverts merge request !288

Diffstat:

Mconfig/config.exs3+--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 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,