Merge remote-tracking branch 'origin/develop' into apps-api-endpoint

diff --cc lib/pleroma/web/mastodon_api/controllers/app_controller.ex
index d2a35dce21c73827a78a9096f08f3c1caa795767,93e63ba03826fdaa2f33a0608c95aa61b61b5aea..079382b174a414f76155dd5a240d24b4ae665f4f
--- 1/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
--- 2/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
@@@ -44,10 -31,8 +42,9 @@@ defmodule Pleroma.Web.MastodonAPI.AppCo
        params
        |> Map.take([:client_name, :redirect_uris, :website])
        |> Map.put(:scopes, scopes)
 +      |> Maps.put_if_present(:user_id, user_id)
  
      with cs <- App.register_changeset(%App{}, app_attrs),
-          false <- cs.changes[:client_name] == @local_mastodon_name,
           {:ok, app} <- Repo.insert(cs) do
        render(conn, "show.json", app: app)
      end

diff --cc lib/pleroma/web/router.ex
Simple merge