Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Wed, 15 Apr 2020 12:41:43 +0000 (14:41 +0200)
committerlain <lain@soykaf.club>
Wed, 15 Apr 2020 12:41:43 +0000 (14:41 +0200)
commit44bfb491eae00d541e6d11c8b52b5de5bc0bd34e
tree0fae87b11ceb4696075927c7f77228e59bb6926c
parent64c78581fe397b6d9356c52cf3f43becd2ff3b4e
parentad8630b95a691d01ec49344fd1a7578860728d63
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/router.ex
test/web/common_api/common_api_test.exs