git.squeep.com Git - akkoma/commit

projects / akkoma / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7ac0cff bef08b8)

author	lain <lain@soykaf.club>
	Thu, 7 May 2020 16:53:34 +0000 (18:53 +0200)
committer	lain <lain@soykaf.club>
	Thu, 7 May 2020 16:53:34 +0000 (18:53 +0200)
commit	ef55d240540ed9fbac76248c60bdb23f82c3f36e
tree	e65130d12a256026edb1a4768fc97e2271173248	tree \| snapshot
parent	7ac0cffb34567dd72877e13968a10d206f643ad8	commit \| diff
parent	bef08b85e5e1e25b65851938d6152bf0c170af03	commit \| diff

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator

15 files changed:

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/side_effects.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
lib/pleroma/web/pleroma_api/controllers/pleroma_api_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/undo_handling_test.exs	\|	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

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