diff options
| author | lambda <lain@soykaf.club> | 2019-04-04 07:34:20 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-04 07:34:20 +0000 |
| commit | c900ff39afa97b5ea24145611f42e8085e343db1 (patch) | |
| tree | df96750b386e39fd273280bfcc057257b1422d59 | |
| parent | 3f8be270c6682d14d60ba1071bf32d2ceffd6947 (diff) | |
| parent | af0065a71feb470bd69bec36999bc40a662e3e83 (diff) | |
| download | pleroma-c900ff39afa97b5ea24145611f42e8085e343db1.tar.gz | |
Merge branch 'features/pleroma-tan-mastofe' into 'develop'
mastodon_api_controller.ex: Add pleroma-tan to initial_state
See merge request pleroma/pleroma!1018
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 0de2cca4e..89fd7629a 100644 --- 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), |