Merge remote-tracking branch 'origin/develop' into reactions
authorlain <lain@soykaf.club>
Fri, 13 Sep 2019 14:31:27 +0000 (16:31 +0200)
committerlain <lain@soykaf.club>
Fri, 13 Sep 2019 14:31:27 +0000 (16:31 +0200)
commita7f31bf06cfe3f8e2549393f34d6573854d783c0
treef53d6747ee73044f7b342d3fdae3d30b5b5b3c90
parentf649a2e972b70dfefb7bfc110b27a0194cda51c5
parent0d9609894f4f4557da2db62a33da1b8995c9e1d7
Merge remote-tracking branch 'origin/develop' into reactions
docs/api/pleroma_api.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
lib/pleroma/web/router.ex
test/web/activity_pub/transmogrifier_test.exs
test/web/pleroma_api/pleroma_api_controller_test.exs