Merge remote-tracking branch 'origin/develop' into reactions
authorlain <lain@soykaf.club>
Wed, 2 Oct 2019 11:27:55 +0000 (13:27 +0200)
committerlain <lain@soykaf.club>
Wed, 2 Oct 2019 11:27:55 +0000 (13:27 +0200)
commit557223b2b5b60956d3e1a19e9fdae9e9798c4fe2
tree71d711f8932a2bd952f9f54ccef1322c55aed1d7
parent19bc0b8c79765dc485e081651a4e4c589d18b970
parent433f2c0f6854d2838819e08f0fb0a9e8cf058021
Merge remote-tracking branch 'origin/develop' into reactions
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/router.ex
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