git.squeep.com Git - akkoma/commit

projects / akkoma / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 208baf1 8aa7143)

author	lain <lain@soykaf.club>
	Fri, 10 Jul 2020 10:26:53 +0000 (12:26 +0200)
committer	lain <lain@soykaf.club>
	Fri, 10 Jul 2020 10:26:53 +0000 (12:26 +0200)
commit	b39eb6ecc573c310801fe49f35d92246ddcb6226
tree	32b20b5a0ec3f5c8d44f1157087868adfaa549b0	tree \| snapshot
parent	208baf157ad0c8be470566d5d51d0214c229e6a5	commit \| diff
parent	8aa7143f464562ca2a0572087c526f26d1a3b7ef	commit \| diff

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information

12 files changed:

CHANGELOG.md	diff1 \|	diff2 \|	blob \| history
docs/API/differences_in_mastoapi_responses.md	diff1 \|	diff2 \|	blob \| history
lib/pleroma/user.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/api_spec/operations/account_operation.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/api_spec/schemas/account.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/mastodon_api/controllers/account_controller.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/mastodon_api/views/account_view.ex	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/activity_pub_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/object_validators/chat_validation_test.exs	\|	diff2 \|	blob \| history
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/views/account_view_test.exs	diff1 \|	diff2 \|	blob \| history

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