Merge remote-tracking branch 'upstream/develop' into restrict-domain

[akkoma] / test / pleroma / integration / mastodon_websocket_test.exs

diff --git a/test/integration/mastodon_websocket_test.exs b/test/pleroma/integration/mastodon_websocket_test.exs
similarity index 100%
rename from test/integration/mastodon_websocket_test.exs
rename to test/pleroma/integration/mastodon_websocket_test.exs