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)
commit4db88242e52b00dc350b9a2ecaaea5b7ea7b21c6
tree6c7e6dee6abd7909dad06e5b97f7babcce12fd58
parent994ac4357cb6c3f64a8889d3a98f9a3adbd37010
parentdeb5f5c40e638472ca5a01370ad127fc4c437150
Merge branch 'docs/direct_conversation_id' into 'develop'

pleroma_api.md: direct_conversation_id vs. conversation_id

See merge request pleroma/pleroma!2263