diff options
author | kaniini <nenolod@gmail.com> | 2018-08-24 18:01:30 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-08-24 18:01:30 +0000 |
commit | cac0bd6d51ac04bb9623d3b8f3a157c0a92291b6 (patch) | |
tree | ce5ecdf21dd3e8ba2db089903a7c7acd83681a27 | |
parent | 265fba7e01d959140ef72913e5f7b9069d6e7d49 (diff) | |
download | pleroma-cac0bd6d51ac04bb9623d3b8f3a157c0a92291b6.tar.gz |
Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"
This reverts merge request !288
-rw-r--r-- | config/config.exs | 3 |
1 files changed, 1 insertions, 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 @@ 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, |