Merge branch 'fix-howto_mediaproxy' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Thu, 18 Jul 2019 12:29:26 +0000 (12:29 +0000)
committerkaniini <ariadne@dereferenced.org>
Thu, 18 Jul 2019 12:29:26 +0000 (12:29 +0000)
commite2c39e1cc077c77f3bd8325b99e9a21d42b8133e
tree25479e5ae801c0fce2e9137ab378f88d6dacddeb
parent0e502cb836369b9581c2196d3ce7a3c8e028ea8c
parent129078eddc1422e3654514477fe438b56dcff562
Merge branch 'fix-howto_mediaproxy' into 'develop'

Fix media proxy doc redirect setting not working

See merge request pleroma/pleroma!1448