git.squeep.com Git - akkoma/commit

Merge branch 'develop' into 'reactions'

# Conflicts:
# CHANGELOG.md

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

lib/pleroma/web/activity_pub/activity_pub.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/transmogrifier.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/utils.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/common_api/common_api.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/router.ex	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/transmogrifier_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/common_api/common_api_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/pleroma_api/controllers/pleroma_api_controller_test.exs	diff1 \|	diff2 \|	blob \| history