Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 11 May 2020 15:14:58 +0000 (17:14 +0200)
committerlain <lain@soykaf.club>
Mon, 11 May 2020 15:14:58 +0000 (17:14 +0200)
commitf28ed36b4daf2f7ed2e35b90b07a5b0552b2a2c9
tree337f5fe20d87a86bbba0da1d47ff1dea4cd0a340
parentfdb98715b8e6ced7c4037b1292fb10980a994803
parente4323141056afc47c2bef7352aaca90edc467a64
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/activity_pub/builder.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/common_api/common_api.ex
test/web/activity_pub/side_effects_test.exs
test/web/common_api/common_api_test.exs