Merge branch 'features/pleroma-tan-mastofe' into 'develop'

mastodon_api_controller.ex: Add pleroma-tan to initial_state

See merge request 
This commit is contained in:
lambda 2019-04-04 07:34:20 +00:00
commit c900ff39af

View file

@ -1121,7 +1121,8 @@ def index(%{assigns: %{user: user}} = conn, _params) do
auto_play_gif: false, auto_play_gif: false,
display_sensitive_media: false, display_sensitive_media: false,
reduce_motion: false, reduce_motion: false,
max_toot_chars: limit max_toot_chars: limit,
mascot: "/images/pleroma-fox-tan-smol.png"
}, },
rights: %{ rights: %{
delete_others_notice: present?(user.info.is_moderator), delete_others_notice: present?(user.info.is_moderator),