mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 08:36:29 +00:00
7410aee886
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs |
||
---|---|---|
.. | ||
account_view_test.exs | ||
list_view_test.exs | ||
mastodon_api_controller_test.exs | ||
notification_view_test.exs | ||
push_subscription_view_test.exs | ||
status_view_test.exs | ||
subscription_controller_test.exs |