diff options
| author | lain <lain@soykaf.club> | 2020-06-24 09:00:17 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-24 09:00:17 +0000 |
| commit | 510031ece2ec8761d0555011caaa4fbcd1fc28e4 (patch) | |
| tree | ebb53ef6f271a7dfa6dc84b150bb06970020055c /config | |
| parent | b4a502fc8b0f7efb1ef973548fec20661038a18a (diff) | |
| parent | 65f3eb333b001586771247ea9949e40bfec0a947 (diff) | |
| download | pleroma-510031ece2ec8761d0555011caaa4fbcd1fc28e4.tar.gz pleroma-510031ece2ec8761d0555011caaa4fbcd1fc28e4.zip | |
Merge branch 'issue/1872-updated-tzdata' into 'develop'
[#1872] use Pleroma.HTTP for Tzdata
See merge request pleroma/pleroma!2678
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 a81ffcd3b..bd559c835 100644 --- a/config/config.exs +++ b/config/config.exs @@ -695,6 +695,8 @@ config :pleroma, :mrf, transparency: true, transparency_exclusions: [] +config :tzdata, :http_client, Pleroma.HTTP.Tzdata + # 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" |