diff options
| author | lain <lain@soykaf.club> | 2020-06-25 10:14:19 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-25 10:14:19 +0000 |
| commit | 1cd1977c0f894eaeaf7aed35c86a5fa0d21b3592 (patch) | |
| tree | 4b6ef1de0b2cd73b827d094b72628bf58010de7b /config | |
| parent | 0e26ef2ab9061f51589fdb5149dee457203305e5 (diff) | |
| parent | 439a1a0218fe032ac35bb2e84516a8a4bf8563b4 (diff) | |
| download | pleroma-1cd1977c0f894eaeaf7aed35c86a5fa0d21b3592.tar.gz pleroma-1cd1977c0f894eaeaf7aed35c86a5fa0d21b3592.zip | |
Merge branch 'issue/1872-ex_aws' into 'develop'
[#1872] use Pleroma.HTTP for ExAws.S3
See merge request pleroma/pleroma!2683
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index bd559c835..5aad26e95 100644 --- a/config/config.exs +++ b/config/config.exs @@ -697,6 +697,8 @@ config :pleroma, :mrf, config :tzdata, :http_client, Pleroma.HTTP.Tzdata +config :ex_aws, http_client: Pleroma.HTTP.ExAws + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |