Merge branch 'issue/2069' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 29 Oct 2020 23:39:15 +0000 (23:39 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 29 Oct 2020 23:39:15 +0000 (23:39 +0000)
commit131f3219e6b895139c5647cd2050dd22adce7139
treecd031668e8909d648bc34047783913127aea6405
parenta326a56371602e05315c1a5a509ee1fa887dbb1c
parent0d5088c2b83fafd9d8da1f1b04936f831ac5ee87
Merge branch 'issue/2069' into 'develop'

[#2069] unread_conversation_count

See merge request pleroma/pleroma!2939
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
test/pleroma/conversation/participation_test.exs
test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
test/pleroma/web/pleroma_api/controllers/conversation_controller_test.exs