git.squeep.com Git - akkoma/commit

projects / akkoma / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: faced62 f11eebc)

author	lain <lain@soykaf.club>
	Tue, 5 Nov 2019 14:21:00 +0000 (15:21 +0100)
committer	lain <lain@soykaf.club>
	Tue, 5 Nov 2019 14:21:00 +0000 (15:21 +0100)
commit	1bd1f62af55e01613e6362661b36a19091c87424
tree	519963a50af82c1a0b251f1405d663ba9ccd4714	tree \| snapshot
parent	faced6236b9e2ce9675cf743068f16098b744562	commit \| diff
parent	f11eebc18383be7d7b4b037582e4e1e08b74653b	commit \| diff

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

15 files changed:

lib/pleroma/object/containment.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.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/notification_test.exs	diff1 \|	diff2 \|	blob \| history
test/tasks/database_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/common_api/common_api_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/controllers/notification_controller_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/controllers/status_controller_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/ostatus/ostatus_controller_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/pleroma_api/controllers/account_controller_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/push/impl_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/streamer/streamer_test.exs	diff1 \|	diff2 \|	blob \| history

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