Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 25 May 2020 11:57:27 +0000 (13:57 +0200)
committerlain <lain@soykaf.club>
Mon, 25 May 2020 11:57:27 +0000 (13:57 +0200)
commitee35bb5ac287e0ff913685256a826e759add3fb9
tree971031903f987e4b70768ac1f91666fdfe6a10b4
parent578ed3a37f28ecbd9fd976c54ee53e8ed2a6adff
parentec470c4c7717dc9479df9e7b70f9805dcf2f5e08
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
13 files changed:
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
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/mastodon_api/views/instance_view.ex
lib/pleroma/web/router.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
test/web/mastodon_api/views/notification_view_test.exs