git.squeep.com Git - akkoma/commit

projects / akkoma / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 92caae5 4c92dfb)

author	lain <lain@soykaf.club>
	Thu, 7 May 2020 12:45:20 +0000 (14:45 +0200)
committer	lain <lain@soykaf.club>
	Thu, 7 May 2020 12:45:20 +0000 (14:45 +0200)
commit	f0c22df2265e922a66ca69c3508fe812b8e20b6b
tree	be510abc9cc9154e07b2ec9eaf344e6e4e88bed1	tree \| snapshot
parent	92caae592338a3ca307686e7644f2de18bb57ce5	commit \| diff
parent	4c92dfb73ef1f40438adf5da009499205a677912	commit \| diff

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

16 files changed:

lib/pleroma/user.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/builder.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/object_validator.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/object_validators/common_validations.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/side_effects.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/mastodon_api/controllers/account_controller.ex	diff1 \|	diff2 \|	blob \| history
test/notification_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/activity_pub_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/object_validator_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/side_effects_test.exs	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

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