Merge branch 'bugfix/rich-media-splice-url' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Tue, 23 Jul 2019 23:59:06 +0000 (23:59 +0000)
committerkaniini <ariadne@dereferenced.org>
Tue, 23 Jul 2019 23:59:06 +0000 (23:59 +0000)
rich media: parser: splice the given URL into the result

See merge request pleroma/pleroma!1480


Trivial merge