From: rinpatch <rinpatch@sdf.org>
Date: Thu, 16 May 2019 18:32:42 +0000 (+0000)
Subject: Merge branch 'conversations-import' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ad76307a825689017f42a11849ad235d3c3b7cc8;p=akkoma

Merge branch 'conversations-import' into 'develop'

Conversations import

Closes #871

See merge request pleroma/pleroma!1127
---

ad76307a825689017f42a11849ad235d3c3b7cc8