From: kaniini <nenolod@gmail.com>
Date: Fri, 24 Aug 2018 18:01:30 +0000 (+0000)
Subject: Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=cac0bd6d51ac04bb9623d3b8f3a157c0a92291b6;p=akkoma

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

This reverts merge request !288
---

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 @@ 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,