diff options
| author | lain <lain@soykaf.club> | 2020-07-27 16:19:45 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-27 16:19:45 +0200 |
| commit | 762c9ea5641ad67f0e664ad584f5cc1a5ed84857 (patch) | |
| tree | cce827b6485732f7c1183588698dde01405e0d64 /config/test.exs | |
| parent | 1dd6de03ee655f5247ac62fee488307c934d7378 (diff) | |
| parent | 2a3abfd326f0cbb588dfe66a23e9783be3038a5e (diff) | |
| download | pleroma-762c9ea5641ad67f0e664ad584f5cc1a5ed84857.tar.gz pleroma-762c9ea5641ad67f0e664ad584f5cc1a5ed84857.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index abcf793e5..db0655e73 100644 --- a/config/test.exs +++ b/config/test.exs @@ -118,6 +118,8 @@ config :pleroma, Pleroma.Uploaders.S3, streaming_enabled: true, public_endpoint: nil +config :tzdata, :autoupdate, :disabled + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |