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
..
activity_pub	[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests	2019-07-09 21:46:16 +03:00
admin_api	Add fallback value to the admin report view.	2019-07-02 01:27:00 +00:00
auth	…
common_api	[#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.	2019-07-08 19:53:02 +03:00
instances	…
mastodon_api	[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests	2019-07-09 21:46:16 +03:00
metadata	…
mongooseim	…
oauth	…
ostatus	[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests	2019-07-09 21:46:16 +03:00
plugs	Testing: Don't federate in testing.	2019-07-09 15:30:51 +09:00
push	…
rich_media	…
salmon	…
twitter_api	[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests	2019-07-09 21:46:16 +03:00
views	…
web_finger	Testing: Don't federate in testing.	2019-07-09 15:30:51 +09:00
websub	Testing: Don't federate in testing.	2019-07-09 15:30:51 +09:00
fallback_test.exs	…
federator_test.exs	Testing: Don't federate in testing.	2019-07-09 15:30:51 +09:00
node_info_test.exs	…
rel_me_test.exs	…
retry_queue_test.exs	…
streamer_test.exs	…