Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactv...
authorlain <lain@soykaf.club>
Thu, 7 May 2020 13:03:12 +0000 (15:03 +0200)
committerlain <lain@soykaf.club>
Thu, 7 May 2020 13:03:12 +0000 (15:03 +0200)
commit7ac0cffb34567dd72877e13968a10d206f643ad8
tree061fbd748a1b62ddd0555dcb257c39ff5f2ce48a
parentdb55dc944581b1d4b50d1608b2e991050ea29bb3
parentb7635bf2b6c5251ffc8f3b3b8e1bc7ee9db83b7e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
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
test/notification_test.exs
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/object_validator_test.exs
test/web/activity_pub/side_effects_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/common_api/common_api_test.exs
test/web/mastodon_api/views/status_view_test.exs