diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-07-27 12:29:18 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-07-27 12:29:18 -0500 |
| commit | 6747bf2e1642d7715a9f08469247bc99ff7165cb (patch) | |
| tree | 9161918fc6979ac2fa1f41f203a1e42cd89fc7c8 /config/test.exs | |
| parent | 6931dbfa582f0e5360e74dffdceee1b9ed564b17 (diff) | |
| parent | 2a3abfd326f0cbb588dfe66a23e9783be3038a5e (diff) | |
| download | pleroma-6747bf2e1642d7715a9f08469247bc99ff7165cb.tar.gz pleroma-6747bf2e1642d7715a9f08469247bc99ff7165cb.zip | |
Merge remote-tracking branch 'upstream/develop' into by-approval
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 |