Merge branch 'feature/rich-text' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 31 Aug 2018 03:41:00 +0000 (03:41 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 31 Aug 2018 03:41:00 +0000 (03:41 +0000)
rich text support

See merge request pleroma/pleroma!309


Trivial merge