From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 3 Sep 2020 15:34:06 +0000 (-0500)
Subject: Merge branch 'develop' into media-preview-proxy
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=85446cc30c97a326d90b4ef719ba2e54c2ad423f;p=akkoma

Merge branch 'develop' into media-preview-proxy
---

85446cc30c97a326d90b4ef719ba2e54c2ad423f
diff --cc lib/pleroma/web/mastodon_api/views/account_view.ex
index eef45b35d,d2a30a548..7eb4e86fe
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@@ -247,12 -245,12 +247,12 @@@ defmodule Pleroma.Web.MastodonAPI.Accou
        followers_count: followers_count,
        following_count: following_count,
        statuses_count: user.note_count,
-       note: user.bio || "",
+       note: user.bio,
        url: user.uri || user.ap_id,
 -      avatar: image,
 -      avatar_static: image,
 +      avatar: avatar,
 +      avatar_static: avatar_static,
        header: header,
 -      header_static: header,
 +      header_static: header_static,
        emojis: emojis,
        fields: user.fields,
        bot: bot,