Merge remote-tracking branch 'upstream/develop' into block-behavior

[akkoma] / test / pleroma / web / mastodon_api / controllers / timeline_controller_test.exs

diff --git a/test/web/mastodon_api/controllers/timeline_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
similarity index 100%
rename from test/web/mastodon_api/controllers/timeline_controller_test.exs
rename to test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs