diff options
author | kaniini <nenolod@gmail.com> | 2018-08-24 17:40:55 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-08-24 17:40:55 +0000 |
commit | 265fba7e01d959140ef72913e5f7b9069d6e7d49 (patch) | |
tree | 953c3e1ed4af2515106f8870f53255dbe60d6c7c | |
parent | 8b9fe0c7a167173b6ad2c735e30a60c55840f26d (diff) | |
parent | 661a985cb933c2bcb023b1e9d9131595f164e3e4 (diff) | |
download | pleroma-265fba7e01d959140ef72913e5f7b9069d6e7d49.tar.gz |
Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'
add collapseMessageWithSubject in config
See merge request pleroma/pleroma!288
-rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 839e6bde6..f89dd86f7 100644 --- 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, |