Merge remote-tracking branch 'origin' into follower-hiding

diff --cc lib/pleroma/user/info.ex
index cefe33577f9e646e656f18d01d215a8f641d46ef,49b2f0edab1e66cd5e540e5446b6b05e50ca5c71..6829c26f6e664b700805d770c642504aeb6365a2
--- 1/lib/pleroma/user/info.ex
--- 2/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@@ -136,7 -135,7 +136,8 @@@ defmodule Pleroma.User.Info d
        :no_rich_text,
        :default_scope,
        :banner,
 +      :hide_network
+       :background
      ])
    end
  

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

diff --cc lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge

diff --cc test/web/activity_pub/activity_pub_controller_test.exs
Simple merge

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge

diff --cc test/web/twitter_api/twitter_api_controller_test.exs
Simple merge