diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-29 00:52:50 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-29 00:52:50 +0300 |
| commit | 657277ffc0d3d25be4376ed629057a2d2cefb2e1 (patch) | |
| tree | 3fdd4ca236669df9b2afc5bfcd0e5d6002e23666 /config/dev.exs | |
| parent | c0fa0001476a8a45878a0c75125627164497eddf (diff) | |
| parent | c6668c2e7b9908e479527914ca7eb2c838aaab06 (diff) | |
| download | pleroma-657277ffc0d3d25be4376ed629057a2d2cefb2e1.tar.gz pleroma-657277ffc0d3d25be4376ed629057a2d2cefb2e1.zip | |
Resolve conflicts
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") |