pleroma/test/web/mastodon_api/controllers
Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
2019-10-20 20:43:18 +03:00
..
account_controller
account_controller_test.exs Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
app_controller_test.exs
auth_controller_test.exs
conversation_controller_test.exs Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
custom_emoji_controller_test.exs
domain_block_controller_test.exs
filter_controller_test.exs
follow_request_controller_test.exs
instance_controller_test.exs
list_controller_test.exs
media_controller_test.exs
notification_controller_test.exs
poll_controller_test.exs
report_controller_test.exs
scheduled_activity_controller_test.exs
search_controller_test.exs
status_controller_test.exs
subscription_controller_test.exs
suggestion_controller_test.exs
timeline_controller_test.exs