diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-31 04:06:18 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-31 04:06:18 +0000 |
| commit | d40466c291e54bcc31b2ea7ac772ba8229e9547b (patch) | |
| tree | c71b6237b68905fe51d52fa0a3327de362b7411d /lib | |
| parent | a26d5e6b2aba5010c699df659d63048957b347a5 (diff) | |
| parent | 856b5e1ca4d84e097cb78dbf34cf9861faa25e5e (diff) | |
| download | pleroma-d40466c291e54bcc31b2ea7ac772ba8229e9547b.tar.gz | |
Merge branch 'update/pleroma-fe-config-20180831' into 'develop'
config: chase pleroma-fe updates from MR pleroma-fe!324.
See merge request pleroma/pleroma!310
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 2 |
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), |