Merge remote-tracking branch 'origin/develop' into reactions
authorlain <lain@soykaf.club>
Fri, 8 Nov 2019 12:27:11 +0000 (13:27 +0100)
committerlain <lain@soykaf.club>
Fri, 8 Nov 2019 12:27:11 +0000 (13:27 +0100)
commitb22ee9d9666c49d1a3b1757b275e9d303eed4afc
treee7b4138a82c7382f2e2819f0a52481ec39cb12f3
parentd7f9679ff2c9c4bd2b9967d7a32b5a4fe145305e
parent278674223d36f4d789dce92cd541c47b7e19b674
Merge remote-tracking branch 'origin/develop' into reactions
13 files changed:
CHANGELOG.md
docs/API/pleroma_api.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
lib/pleroma/web/router.ex
priv/static/schemas/litepub-0.1.jsonld
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/common_api/common_api_test.exs
test/web/pleroma_api/controllers/pleroma_api_controller_test.exs