Merge branch 'develop' into feature/move-activity
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 28 Oct 2019 08:10:47 +0000 (15:10 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 28 Oct 2019 08:10:47 +0000 (15:10 +0700)
commit42708610857dd4aea1f488a31c1690cd37797333
tree67b255a531530c21caaea86daae462b985a7bdea
parentb777083f3f396a7d8c357ec968f72679befc691c
parente80f90e9dbdb6955e355d6a06eb69ee7051ba6df
Merge branch 'develop' into feature/move-activity
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
test/web/activity_pub/transmogrifier_test.exs