From: kaniini <ariadne@dereferenced.org>
Date: Tue, 23 Jul 2019 23:59:06 +0000 (+0000)
Subject: Merge branch 'bugfix/rich-media-splice-url' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2ae510ee819e86c7841917a85e2adbb7183fe8e4;p=akkoma

Merge branch 'bugfix/rich-media-splice-url' into 'develop'

rich media: parser: splice the given URL into the result

See merge request pleroma/pleroma!1480
---

2ae510ee819e86c7841917a85e2adbb7183fe8e4