git.squeep.com Git - akkoma/commit

projects / akkoma / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fb2d284 fbcc537)

author	lain <lain@soykaf.club>
	Fri, 8 May 2020 11:13:37 +0000 (13:13 +0200)
committer	lain <lain@soykaf.club>
	Fri, 8 May 2020 11:13:37 +0000 (13:13 +0200)
commit	7637ef42033b2da79ca61e9dee8fb4187d1a8257
tree	9b42481388e596d5b5c24a8e3fd22fcdcd69bb46	tree \| snapshot
parent	fb2d284d2897e8b789da4f81ae8d288373d2bf76	commit \| diff
parent	fbcc53760e6fcd393513c05a5bd7a4a6a6f3b731	commit \| diff

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

13 files changed:

lib/pleroma/notification.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/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/mastodon_api/views/account_view.ex	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/common_api/common_api_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/views/account_view_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/views/notification_view_test.exs	diff1 \|	diff2 \|	blob \| history

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