From: kaniini <nenolod@gmail.com>
Date: Fri, 31 Aug 2018 03:41:00 +0000 (+0000)
Subject: Merge branch 'feature/rich-text' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=a26d5e6b;p=akkoma

Merge branch 'feature/rich-text' into 'develop'

rich text support

See merge request pleroma/pleroma!309
---

a26d5e6b2aba5010c699df659d63048957b347a5