git.squeep.com Git - akkoma/commit

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior

Fork of https://akkoma.dev/AkkomaGang/akkoma.git

CHANGELOG.md	diff1 \|	diff2 \|	blob \| history
config/config.exs	diff1 \|	diff2 \|	blob \| history
config/description.exs	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/activity_pub/activity_pub_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs	diff1 \|	diff2 \|	blob \| history