projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
[akkoma]
/
lib
/
pleroma
/
plugs
/
uploaded_media.ex
diff --git
a/lib/pleroma/plugs/uploaded_media.ex
b/lib/pleroma/plugs/uploaded_media.ex
index fd77b8d8f30500dac7ee7c868bc69be3924c28b0..8d0fac7eed37e5ff78e021567dd1a4152390ec3b 100644
(file)
--- a/
lib/pleroma/plugs/uploaded_media.ex
+++ b/
lib/pleroma/plugs/uploaded_media.ex
@@
-36,7
+36,7
@@
defmodule Pleroma.Plugs.UploadedMedia do
conn
end
conn
end
- config = Pleroma.Config.get(
[Pleroma.Upload]
)
+ config = Pleroma.Config.get(
Pleroma.Upload
)
with uploader <- Keyword.fetch!(config, :uploader),
proxy_remote = Keyword.get(config, :proxy_remote, false),
with uploader <- Keyword.fetch!(config, :uploader),
proxy_remote = Keyword.get(config, :proxy_remote, false),