aboutsummaryrefslogtreecommitdiff
path: root/test/web/admin_api
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-07-23 23:59:06 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-23 23:59:06 +0000
commit2ae510ee819e86c7841917a85e2adbb7183fe8e4 (patch)
tree44a60063b1e66c78e69e4e5591f018487e5b8a5f /test/web/admin_api
parent1a751529fb2cd3929e3373a908bec5db5cc32f1b (diff)
parentd3bdb8e7049ebda19593d064b308b40ddb6ab4d1 (diff)
downloadpleroma-2ae510ee819e86c7841917a85e2adbb7183fe8e4.tar.gz
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
Diffstat (limited to 'test/web/admin_api')
0 files changed, 0 insertions, 0 deletions