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

This reverts merge request !288
This commit is contained in:
kaniini 2018-08-24 18:01:30 +00:00
parent 265fba7e01
commit cac0bd6d51
1 changed files with 1 additions and 2 deletions

View File

@ -76,8 +76,7 @@
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,