Merge remote-tracking branch 'upstream/develop' into block-behavior
authorAlex Gleason <alex@alexgleason.me>
Wed, 6 Jan 2021 21:22:35 +0000 (15:22 -0600)
committerAlex Gleason <alex@alexgleason.me>
Wed, 6 Jan 2021 21:22:35 +0000 (15:22 -0600)
commit1438fd958325c3d469315c478f06def9e4dd0de3
tree738e7e9ce8e0e0af89d9dff411191643cbf45aab
parent2aeb229de3f59e1704c633c31415e7e834f6ba67
parent5e128a6be30563adc3b8a938aa68d18ac04cdfa0
Merge remote-tracking branch 'upstream/develop' into block-behavior
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/web/activity_pub/activity_pub.ex
test/pleroma/web/activity_pub/activity_pub_test.exs
test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs