Merge branch 'conversations-import' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 16 May 2019 18:32:42 +0000 (18:32 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 16 May 2019 18:32:42 +0000 (18:32 +0000)
commitad76307a825689017f42a11849ad235d3c3b7cc8
treecf1a0f21f7370e0f833bde853367c7d7a7f9906b
parentfde30aee43edd50a40dd4bfdc0008f5395dfc751
parentcd127d2fa43e6b1ecd7fadfc1d6293b2a432be18
Merge branch 'conversations-import' into 'develop'

Conversations import

Closes #871

See merge request pleroma/pleroma!1127