Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships		2019-10-24 14:55:36 +07:00
..
account_controller	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
account_controller_test.exs	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
app_controller_test.exs
auth_controller_test.exs
conversation_controller_test.exs	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation	2019-10-20 22:29:56 +03:00
custom_emoji_controller_test.exs
domain_block_controller_test.exs
filter_controller_test.exs
follow_request_controller_test.exs	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
instance_controller_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
list_controller_test.exs
marker_controller_test.exs	add Markers /api/v1/markers	2019-10-17 15:26:59 +03:00
media_controller_test.exs
notification_controller_test.exs	Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints	2019-10-14 02:57:21 +03:00
poll_controller_test.exs
report_controller_test.exs
scheduled_activity_controller_test.exs
search_controller_test.exs	tests: mastodon search: search for an account that is visible via activitypub, not ostatus	2019-10-18 14:50:10 +00:00
status_controller_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-21 11:05:09 +03:00
subscription_controller_test.exs
suggestion_controller_test.exs
timeline_controller_test.exs	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00