X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fdev.exs;h=7e1e3b4beb2a5add28c054f79f71c3ee328708ae;hb=795a5fe441df28dec60963a6e619dd678d375676;hp=a7eb4b6444efdd9da385206a15977f25cf6731eb;hpb=1b4c4d29a3bff0d316162b6a71b1e7ca0ff12647;p=akkoma

diff --git a/config/dev.exs b/config/dev.exs
index a7eb4b644..7e1e3b4be 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -18,7 +18,7 @@ config :pleroma, Pleroma.Web.Endpoint,
   watchers: [],
   secure_cookie_flag: false
 
-config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
+config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Local
 
 # ## SSL Support
 #
@@ -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")