Merge branch 'spc-fix-2' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 7 Jan 2019 20:39:46 +0000 (20:39 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 7 Jan 2019 20:39:46 +0000 (20:39 +0000)
Actually put some onformation in the error user, make it actually properly parse in conversations.

See merge request pleroma/pleroma!638


Trivial merge