Merge branch 'develop' into media-preview-proxy

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc lib/pleroma/web/mastodon_api/views/account_view.ex
index eef45b35d61dba658f2b6568ccfb8e5e5c5566b2,d2a30a5483022d426da265b9a43bf2a931c48d77..7eb4e86fec624ed2d10a43def5d9c04711152ade
--- 1/lib/pleroma/web/mastodon_api/views/account_view.ex
--- 2/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,

diff --cc lib/pleroma/web/mastodon_api/views/status_view.ex
Simple merge

diff --cc mix.lock
Simple merge