diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-24 18:27:43 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-24 18:27:43 +0000 |
| commit | 9ded0ee1a5ac5b60dfca983fee3875690336fa70 (patch) | |
| tree | fa40437704dd3243712f2b1d3ece70cce34b43ea /lib | |
| parent | cac0bd6d51ac04bb9623d3b8f3a157c0a92291b6 (diff) | |
| parent | 09cb40220336f464e63ad4f56370c284028ccc94 (diff) | |
| download | pleroma-9ded0ee1a5ac5b60dfca983fee3875690336fa70.tar.gz | |
Merge branch 'config/fe-collapse-subject' into 'develop'
fe config: add collapse_message_with_subject fe option
See merge request pleroma/pleroma!289
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 24ebdf007..7dbac620e 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -175,7 +175,9 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do showWhoToFollowPanel: Keyword.get(@instance_fe, :show_who_to_follow_panel), scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled), whoToFollowProvider: Keyword.get(@instance_fe, :who_to_follow_provider), - whoToFollowLink: Keyword.get(@instance_fe, :who_to_follow_link) + whoToFollowLink: Keyword.get(@instance_fe, :who_to_follow_link), + collapseMessageWithSubject: + Keyword.get(@instance_fe, :collapse_message_with_subject) } } }) |