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)
commit2ae510ee819e86c7841917a85e2adbb7183fe8e4
tree44a60063b1e66c78e69e4e5591f018487e5b8a5f
parent1a751529fb2cd3929e3373a908bec5db5cc32f1b
parentd3bdb8e7049ebda19593d064b308b40ddb6ab4d1
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