Merge branch 'docs/direct_conversation_id' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 13 Mar 2020 18:58:22 +0000 (18:58 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 13 Mar 2020 18:58:22 +0000 (18:58 +0000)
pleroma_api.md: direct_conversation_id vs. conversation_id

See merge request pleroma/pleroma!2263


Trivial merge