Fix merge conflicts with upstream

diff --cc CHANGELOG.md
index 4f590dbd3600fbfbad51fc9a3199075528c00e8f,2d1ff5b7bc2b1a76fa1b3f6ae16558b0b794cb75..72a67eb8df8b8817d69da4352dd611b3ff6e63ba
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,13 -6,12 +6,16 @@@ The format is based on [Keep a Changelo
  
  ## Unreleased
  
 +### Removed
 +
 +- MastoFE
 +
  ### Changed
  
+ - **Breaking:** Configuration: `:chat, enabled` moved to `:shout, enabled` and `:instance, chat_limit` moved to `:shout, limit`
  - The `application` metadata returned with statuses is no longer hardcoded. Apps that want to display these details will now have valid data for new posts after this change.
+ - HTTPSecurityPlug now sends a response header to opt out of Google's FLoC (Federated Learning of Cohorts) targeted advertising.
+ - Email address is now returned if requesting user is the owner of the user account so it can be exposed in client and FE user settings UIs.
  
  ### Added
  

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/o_auth/o_auth_controller.ex
index ae040c6eb94b7767d0b6d6bba4ce33a5bcacda7e,42f4d768f0b3643d075a30844bcaca52168c167c..73d48549710fcf014e50cfc9008ef2738fa453fd
--- 1/lib/pleroma/web/o_auth/o_auth_controller.ex
--- 2/lib/pleroma/web/o_auth/o_auth_controller.ex
+++ b/lib/pleroma/web/o_auth/o_auth_controller.ex
@@@ -600,6 -600,9 +600,12 @@@ defmodule Pleroma.Web.OAuth.OAuthContro
      end
    end
  
++<<<<<<< HEAD
++=======
+   # Special case: Local MastodonFE
+   defp redirect_uri(%Plug.Conn{} = conn, "."), do: Routes.auth_url(conn, :login)
+ 
++>>>>>>> 0c56f9de0d607b88fd107e0bd13ef286f0629346
    defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri
  
    defp get_session_registration_id(%Plug.Conn{} = conn), do: get_session(conn, :registration_id)

diff --cc lib/pleroma/web/router.ex
index 936053ee2fcfc65ea9eccfed9ef098728e3f6a16,efca7078a178344c091e17ac61f748bee68e65ba..9695667b6428b354e86f279fcee528714b964b42
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -732,11 -744,30 +731,11 @@@ defmodule Pleroma.Web.Router d
      get("/:version", Nodeinfo.NodeinfoController, :nodeinfo)
    end
  
-   scope "/proxy/", Pleroma.Web.MediaProxy do
-     get("/preview/:sig/:url", MediaProxyController, :preview)
-     get("/preview/:sig/:url/:filename", MediaProxyController, :preview)
-     get("/:sig/:url", MediaProxyController, :remote)
-     get("/:sig/:url/:filename", MediaProxyController, :remote)
 -  scope "/", Pleroma.Web do
 -    pipe_through(:api)
 -
 -    get("/web/manifest.json", MastoFEController, :manifest)
 -  end
 -
 -  scope "/", Pleroma.Web do
 -    pipe_through(:mastodon_html)
 -
 -    get("/web/login", MastodonAPI.AuthController, :login)
 -    delete("/auth/sign_out", MastodonAPI.AuthController, :logout)
 -
 -    post("/auth/password", MastodonAPI.AuthController, :password_reset)
 -
 -    get("/web/*path", MastoFEController, :index)
 -
 -    get("/embed/:id", EmbedController, :show)
 -  end
 -
+   scope "/proxy/", Pleroma.Web do
+     get("/preview/:sig/:url", MediaProxy.MediaProxyController, :preview)
+     get("/preview/:sig/:url/:filename", MediaProxy.MediaProxyController, :preview)
+     get("/:sig/:url", MediaProxy.MediaProxyController, :remote)
+     get("/:sig/:url/:filename", MediaProxy.MediaProxyController, :remote)
    end
  
    if Pleroma.Config.get(:env) == :dev do

diff --cc test/pleroma/user_test.exs
Simple merge

diff --cc test/pleroma/web/plugs/frontend_static_plug_test.exs
Simple merge