Resolve merge conflicts
authorrinpatch <rinpatch@sdf.org>
Sat, 20 Jul 2019 19:04:47 +0000 (22:04 +0300)
committerrinpatch <rinpatch@sdf.org>
Sat, 20 Jul 2019 19:04:47 +0000 (22:04 +0300)
commit196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3
tree51fa0436998541c3bcc1885eaa2188d7dbb7d469
parentc3ecaea64dd377b586e3b2a5316e90884ec78fe6
parentfe548f322e834c7c81678a460c54c71f1198021c
Resolve merge conflicts
config/test.exs
lib/pleroma/object/fetcher.ex
lib/pleroma/user.ex
lib/pleroma/user/info.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/transmogrifier_test.exs