Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
authorEgor Kislitsyn <egor@kislitsyn.com>
Wed, 6 Feb 2019 04:33:00 +0000 (11:33 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Wed, 6 Feb 2019 04:33:00 +0000 (11:33 +0700)
commit6f05f448f86a0fdaf3bd04e626f6c311692edbef
treee309bb2d6f493f135f9e5fab7411aba0f39b1096
parent14d967f515c4a431b8059a19d4b84a83c0f2aa28
parentc46490b1999dd0ddb3d3b23409ba725c21811a96
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/activity_pub_controller.ex