Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex		2019-10-02 20:42:40 +03:00
..
account_controller	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
account_controller_test.exs	Move account_register, relationships and verify_credentials to MastodonAPI.AccountController	2019-09-30 19:10:55 +07:00
conversation_controller_test.exs	Extract conversation actions from MastodonAPIController to ConversationController	2019-09-30 16:52:07 +07:00
domain_block_controller_test.exs	Disable async in DomainBlockControllerTest	2019-09-30 19:10:55 +07:00
filter_controller_test.exs	Extract filter actions from MastodonAPIController to FilterController	2019-09-27 13:06:25 +07:00
follow_request_controller_test.exs	Extract follow requests actions from MastodonAPIController to FollowRequestController	2019-09-27 14:25:17 +07:00
list_controller_test.exs
notification_controller_test.exs	Extract notification actions from MastodonAPIController into NotificationController	2019-09-24 15:16:44 +07:00
report_controller_test.exs	Fix ReportControllerTest	2019-09-30 18:30:10 +07:00
scheduled_activity_controller_test.exs	Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController	2019-09-27 13:36:28 +07:00
search_controller_test.exs
status_controller_test.exs	status_controller.ex: Posting media status without content defined	2019-09-28 01:53:41 +02:00
subscription_controller_test.exs
timeline_controller_test.exs	Extract timeline actions from MastodonAPIController into TimelineController	2019-09-26 10:53:42 +07:00