Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
authorAlex Gleason <alex@alexgleason.me>
Sun, 18 Jul 2021 16:36:41 +0000 (11:36 -0500)
committerAlex Gleason <alex@alexgleason.me>
Sun, 18 Jul 2021 16:49:22 +0000 (11:49 -0500)
commit62bf6d67e393d2b290d226e8505d622d944c9a26
treee1503a97fcc551b1495e3c98b2acc889e8a48299
parent70f1496eb861650d16310205cef1957fcd201948
parent3f58213646238aeca542e2f69ef3bbf0105eaa5d
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
config/config.exs
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/side_effects.ex
test/pleroma/notification_test.exs
test/pleroma/web/common_api_test.exs
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
test/support/factory.ex