Ivan Tashkinov 829e997223 [#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests ... # Conflicts: # lib/pleroma/object.ex # test/web/activity_pub/transmogrifier_test.exs # test/web/ostatus/ostatus_test.exs		2019-07-09 21:46:16 +03:00
..
mastodon_api_controller
account_view_test.exs
list_view_test.exs
mastodon_api_controller_test.exs	Merge branch 'remove-avatar-header' into 'develop'	2019-07-09 17:51:41 +00:00
notification_view_test.exs
push_subscription_view_test.exs
scheduled_activity_view_test.exs
search_controller_test.exs
status_view_test.exs	[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests	2019-07-09 21:46:16 +03:00
subscription_controller_test.exs