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)
commit3065fa4dfd6831912ea612fd660e80e838f57ccb
tree12900f204614e1bdeb1a9258121d890b5165d8bc
parent74e109373238c3c915bdf23b364aedd0ca0f6970
parenta16b17cc61a57d1adbc6f10f16fc36e8238c6c2a
Merge branch 'spc-fix-2' into 'develop'

Actually put some onformation in the error user, make it actually properly parse in conversations.

See merge request pleroma/pleroma!638