diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-21 06:41:13 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-21 06:41:13 +0300 |
| commit | d55358f3705c34510f5ec1d9cef7ab3b0f11ed2f (patch) | |
| tree | 2a6018046d37201c6d0236a0ea23ffabbeb86d5c /config | |
| parent | 4bec121798218f8abf8d2915fa7c26ccb23a4f4a (diff) | |
| parent | 2437f5128407bbcdfc152ea3f008d7eecc1728f2 (diff) | |
| download | pleroma-d55358f3705c34510f5ec1d9cef7ab3b0f11ed2f.tar.gz pleroma-d55358f3705c34510f5ec1d9cef7ab3b0f11ed2f.zip | |
Merge branch 'develop' into release-docs
Diffstat (limited to 'config')
| -rw-r--r-- | config/dev.exs | 4 | ||||
| -rw-r--r-- | config/prod.exs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/dev.exs b/config/dev.exs index 71b11f7c3..7e1e3b4be 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -60,5 +60,5 @@ else ) end -if File.exists?("./config/dev.migrated.secret.exs"), - do: import_config("./config/dev.migrated.secret.exs") +if File.exists?("./config/dev.exported_from_db.secret.exs"), + do: import_config("dev.exported_from_db.secret.exs") diff --git a/config/prod.exs b/config/prod.exs index 42edccf64..9c205cbd2 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -64,5 +64,5 @@ config :logger, level: :warn # which should be versioned separately. import_config "prod.secret.exs" -if File.exists?("./config/prod.migrated.secret.exs"), - do: import_config("./config/prod.migrated.secret.exs") +if File.exists?("./config/prod.exported_from_db.secret.exs"), + do: import_config("prod.exported_from_db.secret.exs") |