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
..
representers
views
password_controller_test.exs
twitter_api_controller_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
twitter_api_test.exs
util_controller_test.exs