projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c47d85 e07e9cb)
Merge branch 'revert-5c04e817' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sat, 5 Oct 2019 10:00:44 +0000 (10:00 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 5 Oct 2019 10:00:44 +0000 (10:00 +0000)
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"

See merge request pleroma/pleroma!1794


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