git.squeep.com Git - akkoma/commit

author	kaniini <ariadne@dereferenced.org>
	Sat, 5 Oct 2019 10:00:05 +0000 (10:00 +0000)
committer	kaniini <ariadne@dereferenced.org>
	Sat, 5 Oct 2019 10:00:05 +0000 (10:00 +0000)
commit	e07e9cb75e6605218acea1ef41772ca29124bd0d
tree	2a79aae59c6ce7500d360ba35a5b0aafe2146072	tree \| snapshot
parent	9c47d8571c6c46503d9bb836aea933eda6e9e0a5	commit \| diff

Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"

This reverts merge request !1737

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

CHANGELOG.md		diff \| blob \| history
docs/API/differences_in_mastoapi_responses.md		diff \| blob \| history
lib/pleroma/conversation.ex		diff \| blob \| history
lib/pleroma/conversation/participation.ex		diff \| blob \| history
lib/pleroma/user.ex		diff \| blob \| history
lib/pleroma/user/info.ex		diff \| blob \| history
lib/pleroma/web/mastodon_api/views/account_view.ex		diff \| blob \| history
test/conversation/participation_test.exs		diff \| blob \| history
test/web/mastodon_api/controllers/conversation_controller_test.exs		diff \| blob \| history
test/web/mastodon_api/views/account_view_test.exs		diff \| blob \| history
test/web/pleroma_api/controllers/pleroma_api_controller_test.exs		diff \| blob \| history