Ivan Tashkinov cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs		2019-11-21 16:47:52 +03:00
..
account_controller
account_controller_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-21 16:47:52 +03:00
app_controller_test.exs
auth_controller_test.exs
conversation_controller_test.exs	Mastodon API: Add the recipients parameter to GET /api/v1/conversations	2019-11-07 08:26:24 +03:00
custom_emoji_controller_test.exs
domain_block_controller_test.exs
filter_controller_test.exs	Fix sporadically failing test	2019-11-20 14:25:00 +07:00
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
list_controller_test.exs
marker_controller_test.exs
media_controller_test.exs
notification_controller_test.exs	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00
poll_controller_test.exs
report_controller_test.exs
scheduled_activity_controller_test.exs	Fix sporadically failing test	2019-11-20 14:25:00 +07:00
search_controller_test.exs
status_controller_test.exs	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00
subscription_controller_test.exs
suggestion_controller_test.exs
timeline_controller_test.exs	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00