Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs		2020-05-13 12:42:36 +03:00
..
controllers	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-13 12:42:36 +03:00
views	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-13 12:42:36 +03:00
mastodon_api_controller_test.exs	[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.	2020-04-24 16:52:38 +03:00
mastodon_api_test.exs	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00