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

add collapseMessageWithSubject in config See merge request pleroma/pleroma!288
2018-08-24 17:40:55 +00:00 · 2018-08-24 17:40:55 +00:00 · 265fba7e01
parent 8b9fe0c7a1 661a985cb9
commit 265fba7e01
1 changed files with 2 additions and 1 deletions
--- 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,