git.squeep.com Git - akkoma/commit

projects / akkoma / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9968b7e 8b6221d)

author	Mark Felder <feld@FreeBSD.org>
	Tue, 13 Oct 2020 14:54:29 +0000 (09:54 -0500)
committer	Mark Felder <feld@FreeBSD.org>
	Tue, 13 Oct 2020 14:54:29 +0000 (09:54 -0500)
commit	409f694e4f90d34285b43c7e7afc594bc386d893
tree	70d3283bcc7e565ba37b253c7cd7dbb94b9d9aa3	tree \| snapshot
parent	9968b7efedc64d0239db5578de7fc66ff4ce894d	commit \| diff
parent	8b6221d4ecd1d7e354e7de831dd46e285cb85077	commit \| diff

Merge branch 'develop' into refactor/locked_user_field

15 files changed:

lib/pleroma/web/mastodon_api/controllers/account_controller.ex	diff1 \|	diff2 \|	blob \| history
test/mix/tasks/pleroma/user_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/notification_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/user_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/activity_pub/activity_pub_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/activity_pub/transmogrifier/follow_handling_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/activity_pub/utils_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/common_api_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/mastodon_api/controllers/follow_request_controller_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/mastodon_api/update_credentials_test.exs	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/mastodon_api/views/account_view_test.exs	diff1 \|	diff2 \|	blob \| history

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