logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: c900ff39afa97b5ea24145611f42e8085e343db1
parent 3f8be270c6682d14d60ba1071bf32d2ceffd6947
Author: lambda <lain@soykaf.club>
Date:   Thu,  4 Apr 2019 07:34:20 +0000

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

mastodon_api_controller.ex: Add pleroma-tan to initial_state

See merge request pleroma/pleroma!1018

Diffstat:

Mlib/pleroma/web/mastodon_api/mastodon_api_controller.ex3++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -1121,7 +1121,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do auto_play_gif: false, display_sensitive_media: false, reduce_motion: false, - max_toot_chars: limit + max_toot_chars: limit, + mascot: "/images/pleroma-fox-tan-smol.png" }, rights: %{ delete_others_notice: present?(user.info.is_moderator),