Merge branch 'develop' into 'cleanup/masto_fe-default_settings'

# Conflicts:
#   lib/pleroma/web/views/masto_fe_view.ex

diff --cc lib/pleroma/web/views/masto_fe_view.ex
index 3b78629dc080891546e2c47ba937ca9e5e4137ca,f739dacb61221722a3c53f744529fb9fa11d2a27..b1669d1986809d98b9985405f82e5e7f6ab021b7
--- 1/lib/pleroma/web/views/masto_fe_view.ex
--- 2/lib/pleroma/web/views/masto_fe_view.ex
+++ b/lib/pleroma/web/views/masto_fe_view.ex
@@@ -56,7 -86,7 +56,7 @@@ defmodule Pleroma.Web.MastoFEView d
            "video\/mp4"
          ]
        },
-       settings: user.settings || %{},
 -      settings: user.mastofe_settings || @default_settings,
++      settings: user.mastofe_settings || %{},
        push_subscription: nil,
        accounts: %{user.id => render(AccountView, "show.json", user: user, for: user)},
        custom_emojis: render(CustomEmojiView, "index.json", custom_emojis: custom_emojis),