Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
authorFrancis Dinh <normandy@firemail.cc>
Sun, 20 May 2018 23:17:15 +0000 (19:17 -0400)
committerFrancis Dinh <normandy@firemail.cc>
Sun, 20 May 2018 23:17:15 +0000 (19:17 -0400)
commit1afd6d37bd2febb58ee09d273b9c7d690022d3c3
tree8be53801457cae7e31f7efdb501b81974ca3b36f
parentd46393f6efd6475bb20b6a12a7c6ebf800f6c5b5
parent961f1312571843209487cc1caa9355fa6552d965
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow

Fixed some conflicts in transmogrifier.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/utils.ex
test/web/activity_pub/transmogrifier_test.exs