From: rinpatch <rinpatch@sdf.org>
Date: Fri, 13 Mar 2020 18:58:22 +0000 (+0000)
Subject: Merge branch 'docs/direct_conversation_id' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4db88242e52b00dc350b9a2ecaaea5b7ea7b21c6;p=akkoma

Merge branch 'docs/direct_conversation_id' into 'develop'

pleroma_api.md: direct_conversation_id vs. conversation_id

See merge request pleroma/pleroma!2263
---

4db88242e52b00dc350b9a2ecaaea5b7ea7b21c6