Merge branch 'conversation-docs' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 19 Sep 2019 19:04:55 +0000 (19:04 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 19 Sep 2019 19:04:55 +0000 (19:04 +0000)
commitc4da7499a3d7b0f5086c1180131df4e35b5b0d15
tree17d6cad5218c69444401b8e38ad143cef303f1c6
parentc1e011624d33052d4d473ebfb4e0c1ff7d2327dd
parentfe4db3b94e71bafb913044de543472764671cd1a
Merge branch 'conversation-docs' into 'develop'

API Docs: Document conversation ids.

See merge request pleroma/pleroma!1701