Merge branch 'develop' into gun

diff --cc CHANGELOG.md
Simple merge

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

diff --cc test/notification_test.exs
Simple merge

diff --cc test/web/mastodon_api/controllers/notification_controller_test.exs
index 0f0a060d241fb3c5573b8c81a4a4808425134558,dbe9a7fd7bf302beaeebc82bc87fc6459534318e..4f6a88950939333f489fe539b165c0e7891286d3
--- 1/test/web/mastodon_api/controllers/notification_controller_test.exs
--- 2/test/web/mastodon_api/controllers/notification_controller_test.exs
+++ b/test/web/mastodon_api/controllers/notification_controller_test.exs
@@@ -407,8 -407,7 +407,8 @@@ defmodule Pleroma.Web.MastodonAPI.Notif
      assert length(json_response(conn, 200)) == 1
    end
  
-   test "see move notifications with `with_move` parameter" do
 +  @tag capture_log: true
+   test "see move notifications" do
      old_user = insert(:user)
      new_user = insert(:user, also_known_as: [old_user.ap_id])
      %{user: follower, conn: conn} = oauth_access(["read:notifications"])

diff --cc test/web/mastodon_api/views/notification_view_test.exs
Simple merge