Merge remote-tracking branch 'upstream/develop' into block-behavior
authorAlex Gleason <alex@alexgleason.me>
Thu, 29 Apr 2021 16:14:32 +0000 (11:14 -0500)
committerAlex Gleason <alex@alexgleason.me>
Thu, 29 Apr 2021 16:14:32 +0000 (11:14 -0500)
commit762be6ce10d2145e8e31d42c5d1a0bab93dbe7b0
tree0416ef7020ba2b333cb223200d7108928f714fde
parentb7b05a074867c1444dd539d6d2331f6d5504f6e6
parent115673bce773f91630c3bd4fd2d0023f92bee163
Merge remote-tracking branch 'upstream/develop' into block-behavior
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/notification.ex
lib/pleroma/web/activity_pub/activity_pub.ex
test/pleroma/web/activity_pub/activity_pub_test.exs
test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs