Resolve merge conflicts and remove IO.inspects
authorrinpatch <rinpatch@sdf.org>
Sat, 18 May 2019 10:37:38 +0000 (13:37 +0300)
committerrinpatch <rinpatch@sdf.org>
Sat, 18 May 2019 10:37:38 +0000 (13:37 +0300)
commit5ece901af3e887664653c79c5e61618cc5cf0ecf
tree93fc7c3bdb70348d5ef91fa9f7db3293b17f9854
parentfd920c897339b9cedea042dd6698d14380cedae7
parent8e9a764dfcde315afd055c8e63543bfca24cc41b
Resolve merge conflicts and remove IO.inspects
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/web/mastodon_api/mastodon_api_controller_test.exs