Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex		2019-10-06 11:43:49 +03:00
..
account_controller	Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 11:43:49 +03:00
account_controller_test.exs	Move follows, mutes and blocks actions to AccountController	2019-10-02 21:22:21 +07:00
app_controller_test.exs
auth_controller_test.exs	Extract auth actions from MastodonAPIController to AuthController	2019-10-01 15:54:45 +07:00
conversation_controller_test.exs	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-05 20:12:00 +03:00
custom_emoji_controller_test.exs	Add CustomEmojiController	2019-10-02 19:16:34 +07:00
domain_block_controller_test.exs
filter_controller_test.exs
follow_request_controller_test.exs
instance_controller_test.exs	Extract instance actions from MastodonAPIController to InstanceController	2019-10-02 14:13:52 +07:00
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	Move :favourites and :bookmarks actions to StatusController	2019-10-02 21:31:19 +07:00
subscription_controller_test.exs
suggestion_controller_test.exs
timeline_controller_test.exs