git.squeep.com Git - akkoma/commit

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator

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

lib/pleroma/user.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub_controller.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/transmogrifier.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/common_api/common_api.ex	diff1 \|	diff2 \|	blob \| history
test/tasks/user_test.exs	diff1 \|	diff2 \|	blob \| history
test/user_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/transmogrifier_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/admin_api/admin_api_controller_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/common_api/common_api_test.exs	diff1 \|	diff2 \|	blob \| history