Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Wed, 6 May 2020 15:36:08 +0000 (17:36 +0200)
committerlain <lain@soykaf.club>
Wed, 6 May 2020 15:36:08 +0000 (17:36 +0200)
commit1748e2694815da20689005110937ea42cd554d70
treea869f3fb48840f9b7f318d8e498024cb8d7ba277
parentfc9d0b6eec1b206a27f4ec19f7939b3318a209ef
parenta32483f224ff1659350bc6e114aa4ba2bcb340a5
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/builder.ex
lib/pleroma/web/activity_pub/object_validator.ex
lib/pleroma/web/activity_pub/side_effects.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/common_api/common_api.ex
test/web/activity_pub/object_validator_test.exs
test/web/activity_pub/side_effects_test.exs
test/web/common_api/common_api_test.exs