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

add collapseMessageWithSubject in config

See merge request pleroma/pleroma!288
This commit is contained in:
kaniini 2018-08-24 17:40:55 +00:00
commit 265fba7e01
1 changed files with 2 additions and 1 deletions

View File

@ -76,7 +76,8 @@
who_to_follow_provider: who_to_follow_provider:
"https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}", "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}",
who_to_follow_link: "https://vinayaka.distsn.org/?{{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, config :pleroma, :activitypub,
accept_blocks: true, accept_blocks: true,