Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into...
authorlain <lain@soykaf.club>
Sat, 26 May 2018 13:15:52 +0000 (15:15 +0200)
committerlain <lain@soykaf.club>
Sat, 26 May 2018 13:15:52 +0000 (15:15 +0200)
commit745072b2cc0ce3be6e1896bcacffb5e48782f6da
tree2d46ec202c6c0bb4e1469da1cd7d369559b8be52
parente1fe46e1cfccb7971032ecfa04426413f0c00ac6
parent0a6c897c9488b26273a5fbb2de1ae1bfa0c96675
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/utils.ex