Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs		2019-10-20 20:43:18 +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	Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views	2019-08-26 19:37:57 +07:00
list_view_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
notification_view_test.exs	notification_view.ex: Make sure account isn’t empty	2019-10-04 07:11:53 +02: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	tests: mastodon api: fix broken test that used OStatus	2019-10-18 15:46:46 +00:00