projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 28335a6d473ff4bd9bdede4afe5cbd2e3fc5e597..e71d5e5a066261a2cd09b42977f623d372fc0048 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-40,8
+40,9
@@
version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
_ -> "Pleroma dev"
end
+# Configures http settings, upstream proxy etc.
config :pleroma, :http,
- proxy_url:
""
+ proxy_url:
nil
config :pleroma, :instance,
version: version,