diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-07-11 13:26:59 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-07-11 13:26:59 +0700 |
| commit | 182f7bbb1170c44eac4ab4a9efa4ff0bff991c98 (patch) | |
| tree | f4c6fe46e82f667be49c8e6aad0ed3b418e4332f /config/dev.exs | |
| parent | ddd4a09b72ede65345ddf45a68eb239b54eda86c (diff) | |
| parent | 4016341a77337e3b71295d27808eebc05152b086 (diff) | |
| download | pleroma-182f7bbb1170c44eac4ab4a9efa4ff0bff991c98.tar.gz pleroma-182f7bbb1170c44eac4ab4a9efa4ff0bff991c98.zip | |
Merge branch 'develop' into feature/addressable-lists
Diffstat (limited to 'config/dev.exs')
| -rw-r--r-- | config/dev.exs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/dev.exs b/config/dev.exs index 0432adce7..7e1e3b4be 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -59,3 +59,6 @@ else "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs" ) end + +if File.exists?("./config/dev.exported_from_db.secret.exs"), + do: import_config("dev.exported_from_db.secret.exs") |