Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Wed, 13 May 2020 10:44:16 +0000 (12:44 +0200)
committerlain <lain@soykaf.club>
Wed, 13 May 2020 10:44:16 +0000 (12:44 +0200)
commit3cff4e24cd8c56af47b1983ea97ec4643dbc183e
tree63e27727ca94f1b57832d6e872ad319c97719bbb
parentc0ea5c60e4e709d3d4415de42a65f878b55dc3bb
parent6706cdce65f8b2dda55380dbfdad5e41e600af2d
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/common_api/utils.ex
lib/pleroma/web/mastodon_api/views/account_view.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/controllers/timeline_controller_test.exs
test/web/mastodon_api/views/account_view_test.exs
test/web/mastodon_api/views/notification_view_test.exs