[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity...
authorIvan Tashkinov <ivant.business@gmail.com>
Tue, 9 Jul 2019 18:46:16 +0000 (21:46 +0300)
committerIvan Tashkinov <ivant.business@gmail.com>
Tue, 9 Jul 2019 18:46:16 +0000 (21:46 +0300)
commit829e99722396c2372770f50d9fc7cfa40c441005
tree6b72aa4ac5e049eb8bf444ade64e8da4499ef023
parent46cf81a544edd91f4c3893897fbe2db053f5f6d5
parent2bb945cb70751bc8e72c036040130bb54c32f391
[#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
lib/pleroma/object.ex
test/web/activity_pub/activity_pub_controller_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/mastodon_api/status_view_test.exs
test/web/ostatus/ostatus_controller_test.exs
test/web/ostatus/ostatus_test.exs
test/web/twitter_api/twitter_api_controller_test.exs