Merge branch 'begone-the-dot-hack' into 'develop'

[akkoma] / config / dev.exs

diff --git a/config/dev.exs b/config/dev.exs
index a7eb4b6444efdd9da385206a15977f25cf6731eb..71b11f7c3ebb0b3dc604cdf602fc6dc903cedf47 100644 (file)
--- 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.migrated.secret.exs"),
+  do: import_config("./config/dev.migrated.secret.exs")