Merge branch 'revert-83508418' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 29 Jul 2019 19:42:35 +0000 (19:42 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 29 Jul 2019 19:42:35 +0000 (19:42 +0000)
commit66575061851f13355958fd292ee545462bf191c0
tree8999d2c1ccdea93e55e1ac7961778bc8d9054873
parent83508418fb0b91b1c5af1a3b0bab7b768a6bf6c4
parent5835069215b880ad261a006cf310da624a82ca4a
Merge branch 'revert-83508418' into 'develop'

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

See merge request pleroma/pleroma!1505