From: lambda <pleromagit@rogerbraun.net>
Date: Fri, 31 Aug 2018 09:53:00 +0000 (+0000)
Subject: Merge branch 'revert-a26d5e6b' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=d31bbb1c;p=akkoma

Merge branch 'revert-a26d5e6b' into 'develop'

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

See merge request pleroma/pleroma!313
---

d31bbb1cfe04ca6073a322bcf77239e7d4b79839