Merge branch 'master' into new-login

7 years ago · 212f4b8162
parent ea1fa1d3e8 b2c63553df
commit 212f4b8162
3 changed files with 6 additions and 3 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -79,6 +79,3 @@ config :exq_ui,
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env}.exs"
-
-# Import custom config.
-import_config "custom*.exs"
--- a/config/dev.exs
+++ b/config/dev.exs
@ -46,3 +46,6 @@ config :asciinema, Asciinema.Repo,

 config :asciinema, Asciinema.Mailer,
  adapter: Bamboo.LocalAdapter
+
+# Import custom config.
+import_config "custom*.exs"
--- a/config/prod.exs
+++ b/config/prod.exs
@ -69,3 +69,6 @@ config :asciinema, Asciinema.Mailer,
  adapter: Bamboo.SMTPAdapter,
  server: "smtp",
  port: 25
+
+# Import custom config.
+import_config "custom*.exs"