diff options
| author | Alex Gleason <alex@alexgleason.me> | 2022-01-25 16:59:07 +0000 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2022-01-25 16:59:07 +0000 |
| commit | 99e9c2c668228e7f373a7ced23e4c5701a86f11b (patch) | |
| tree | d30832251f2d5faa6d75a7dca2126839cc62e8eb /lib | |
| parent | dd7977bb68f8289b1487159a81df510da11cd944 (diff) | |
| parent | ab12a05a432be549b02e3fd84e4e30680a89bbf9 (diff) | |
| download | pleroma-99e9c2c668228e7f373a7ced23e4c5701a86f11b.tar.gz pleroma-99e9c2c668228e7f373a7ced23e4c5701a86f11b.zip | |
Merge branch 'birth-dates' into 'develop'
Fix show_birthday
See merge request pleroma/pleroma!3621
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/account_view.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex index e73d03f06..1d78ced19 100644 --- a/lib/pleroma/web/mastodon_api/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -297,8 +297,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do skip_thread_containment: user.skip_thread_containment, background_image: image_url(user.background) |> MediaProxy.url(), accepts_chat_messages: user.accepts_chat_messages, - favicon: favicon, - birthday: user.birthday + favicon: favicon } } |> maybe_put_role(user, opts[:for]) |