Merge branch 'media-preview-proxy' of git.pleroma.social:pleroma/pleroma into feld...
authorMark Felder <feld@FreeBSD.org>
Thu, 3 Sep 2020 19:48:43 +0000 (14:48 -0500)
committerMark Felder <feld@FreeBSD.org>
Thu, 3 Sep 2020 19:48:43 +0000 (14:48 -0500)
commitd1e1057e22c484a9ad3e3e28ad65b14088903019
tree40f28364fbc99ebbb861c07ed903e7ab03a450cb
parent6141eb94ab034b5141a5c60b2814fb45b829c1ac
parent60c925380da644866836fa4a275f4d57eaaada04
Merge branch 'media-preview-proxy' of git.pleroma.social:pleroma/pleroma into feld-media-preview-proxy
lib/pleroma/web/media_proxy/media_proxy_controller.ex