Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'

[akkoma] / lib / pleroma / web / twitter_api / controllers / util_controller.ex

diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 24ebdf007680f5f1dc65ea025e2d916ef000d15e..7dbac620ef2cffe264f3ea00813a44e1b76ee52e 100644 (file)
--- 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)
             }
           }
         })