Merge branch 'user-info-unread-direct-conversation' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Fri, 4 Oct 2019 17:33:18 +0000 (17:33 +0000)
committerkaniini <ariadne@dereferenced.org>
Fri, 4 Oct 2019 17:33:18 +0000 (17:33 +0000)
commit5c04e8172407660662d1e052e40a665bdb063ae9
treebdf7b5b55064bebc7ce380d1a12fbf153a68a5c1
parent75e415d5f4981c2deab324a9161a183d0a498e5b
parent06d9df79c5c99069dd12e863c99167eb20b6495b
Merge branch 'user-info-unread-direct-conversation' into 'develop'

Add the `unread_conversation_count` field to the user info

See merge request pleroma/pleroma!1737
CHANGELOG.md
lib/pleroma/user.ex