Resolve merge conflicts
authorrinpatch <rinpatch@sdf.org>
Sat, 1 Jun 2019 13:29:58 +0000 (16:29 +0300)
committerrinpatch <rinpatch@sdf.org>
Sat, 1 Jun 2019 13:29:58 +0000 (16:29 +0300)
commit65db5e9f528a3f8d8b3c81953fd160a6744dfffd
tree9da5234f8a9dd411b59e839eeb38254822939e2f
parent300d94c62829d0ec961f3ed6c0242dea102ab0ad
parentf8d4c02431aa634dc74074b93d1cb522e47056ce
Resolve merge conflicts
config/config.exs
docs/config.md
lib/pleroma/object.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/router.ex
test/support/http_request_mock.ex
test/web/activity_pub/transmogrifier_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs