aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/controllers/util_controller.ex
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-08-31 04:01:21 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-08-31 04:01:21 +0000
commit856b5e1ca4d84e097cb78dbf34cf9861faa25e5e (patch)
treec71b6237b68905fe51d52fa0a3327de362b7411d /lib/pleroma/web/twitter_api/controllers/util_controller.ex
parenta26d5e6b2aba5010c699df659d63048957b347a5 (diff)
downloadpleroma-856b5e1ca4d84e097cb78dbf34cf9861faa25e5e.tar.gz
config: chase pleroma-fe updates from MR pleroma-fe!324.
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index d1ecebf61..68e9a47b7 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -168,6 +168,8 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
theme: Keyword.get(@instance_fe, :theme),
background: Keyword.get(@instance_fe, :background),
logo: Keyword.get(@instance_fe, :logo),
+ logoMask: Keyword.get(@instance_fe, :logo_mask),
+ logoMargin: Keyword.get(@instance_fe, :logo_margin),
redirectRootNoLogin: Keyword.get(@instance_fe, :redirect_root_no_login),
redirectRootLogin: Keyword.get(@instance_fe, :redirect_root_login),
chatDisabled: !Keyword.get(@instance_chat, :enabled),