Merge branch 'tests/media_proxy' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sun, 14 Jul 2019 21:01:32 +0000 (21:01 +0000)
committerkaniini <ariadne@dereferenced.org>
Sun, 14 Jul 2019 21:01:32 +0000 (21:01 +0000)
commit46ef8f021635c630bcd6973e6fbb7c58bcafb6bf
tree25e150b785b57bc285dd5b02b0cc6c87b3711d5e
parent4b78622bbaf743d540022b8aeec41405ca0cad8f
parentfa17879c204980c6fb0025b2e51a978669c441da
Merge branch 'tests/media_proxy' into 'develop'

added tests for Web.MediaProxy

See merge request pleroma/pleroma!1418