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)
added tests for Web.MediaProxy

See merge request pleroma/pleroma!1418


Trivial merge