diff options
| author | lain <lain@soykaf.club> | 2018-12-01 09:55:46 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-12-01 09:55:46 +0100 |
| commit | c443c9bd72b04b8a24d904bc20fde0d4ffca71d7 (patch) | |
| tree | 1044379e9e6867ded303f81a6ca49da83e01cfd2 /lib/pleroma/web/endpoint.ex | |
| parent | 1c67277c8031be2212d6faf84c143ac11462c87b (diff) | |
| parent | 8c3ff06e35e11a40cf4eb35a41a2019b7496e62c (diff) | |
| download | pleroma-c443c9bd72b04b8a24d904bc20fde0d4ffca71d7.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
Diffstat (limited to 'lib/pleroma/web/endpoint.ex')
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index 8728c908b..c5f9d51d9 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -12,7 +12,7 @@ defmodule Pleroma.Web.Endpoint do plug(CORSPlug) plug(Pleroma.Plugs.HTTPSecurityPlug) - plug(Plug.Static, at: "/media", from: Pleroma.Uploaders.Local.upload_path(), gzip: false) + plug(Pleroma.Plugs.UploadedMedia) plug( Plug.Static, |