diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-21 20:20:35 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-21 20:20:35 +0300 |
| commit | 2634a16b4cefebfb2a13550bde3fd12e5acd9aaa (patch) | |
| tree | 1c43808f90f13a9e055464f01e4c8a36b28fe50b /lib/pleroma/web/mastodon_api | |
| parent | b830605577f369d6b1a8730a5b3476ceea4fef5a (diff) | |
| parent | d8860eaee46c9bc0a079e90dfb008c54923d7330 (diff) | |
| download | pleroma-2634a16b4cefebfb2a13550bde3fd12e5acd9aaa.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/pleroma/web/mastodon_api')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/account_view.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex index 2768f0291..da1221d47 100644 --- a/lib/pleroma/web/mastodon_api/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -266,7 +266,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do pleroma: %{ ap_id: user.ap_id, also_known_as: user.also_known_as, - confirmation_pending: user.confirmation_pending, + is_confirmed: user.is_confirmed, tags: user.tags, hide_followers_count: user.hide_followers_count, hide_follows_count: user.hide_follows_count, |