Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex		2019-12-04 18:56:31 +03:00
..
account_view_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-12-04 18:56:31 +03:00
conversation_view_test.exs	Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.	2019-11-04 18:36:16 +03:00
list_view_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
marker_view_test.exs	add Markers /api/v1/markers	2019-10-17 15:26:59 +03:00
notification_view_test.exs	fix test	2019-12-04 16:22:01 +03:00
poll_view_test.exs	Extract poll actions from MastodonAPIController to PollController	2019-10-01 11:44:34 +07:00
push_subscription_view_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
scheduled_activity_view_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
status_view_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