Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex		2019-10-23 17:22:42 +03:00
..
account_view_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
conversation_view_test.exs	…
list_view_test.exs	…
marker_view_test.exs	add Markers /api/v1/markers	2019-10-17 15:26:59 +03:00
notification_view_test.exs	…
poll_view_test.exs	…
push_subscription_view_test.exs	…
scheduled_activity_view_test.exs	…
status_view_test.exs	tests: mastodon api: fix broken test that used OStatus	2019-10-18 15:46:46 +00:00