diff options
| author | lain <lain@soykaf.club> | 2020-07-27 12:34:36 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-27 12:34:36 +0000 |
| commit | 2a3abfd326f0cbb588dfe66a23e9783be3038a5e (patch) | |
| tree | be613ab3be331362b94cb1181dd52a8831a2330e /config/test.exs | |
| parent | 64b21cee1417347ddb2a7f7470eb1d7f235ea0ab (diff) | |
| parent | 0d5d1c62efa94ea8fd204dbe4a77073b0374cad4 (diff) | |
| download | pleroma-2a3abfd326f0cbb588dfe66a23e9783be3038a5e.tar.gz pleroma-2a3abfd326f0cbb588dfe66a23e9783be3038a5e.zip | |
Merge branch 'issue/1934-welcome-email' into 'develop'
[#1934] welcome email
See merge request pleroma/pleroma!2786
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 |