From: kaniini <ariadne@dereferenced.org>
Date: Mon, 29 Jul 2019 19:42:35 +0000 (+0000)
Subject: Merge branch 'revert-83508418' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;ds=sidebyside;h=66575061851f13355958fd292ee545462bf191c0;p=akkoma

Merge branch 'revert-83508418' into 'develop'

Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

See merge request pleroma/pleroma!1505
---

66575061851f13355958fd292ee545462bf191c0