From: kaniini <nenolod@gmail.com>
Date: Fri, 5 Oct 2018 21:17:46 +0000 (+0000)
Subject: Merge branch 'revert-d31bbb1c' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=614e47aa7c7f44249961213905860d3076326977;p=akkoma

Merge branch 'revert-d31bbb1c' into 'develop'

Rich Text Redo Branch

See merge request pleroma/pleroma!314
---

614e47aa7c7f44249961213905860d3076326977