projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75e415d 06d9df7)
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)
Add the `unread_conversation_count` field to the user info

See merge request pleroma/pleroma!1737

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/user.ex patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/user.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git