Merge branch 'develop' into release/v3.1.2

fewlinesco · Jan 29, 2021 · 4f3062c · 4f3062c
2 parents 9d5abcd + 15ed372
commit 4f3062c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/bamboo/adapters/smtp_adapter.ex b/lib/bamboo/adapters/smtp_adapter.ex
@@ -517,6 +517,10 @@ defmodule Bamboo.SMTPAdapter do
     [{:auth, value} | config]
   end
 
+  defp to_gen_smtp_server_config({:sockopts, value}, config) do
+    [{:sockopts, value} | config]
+  end
+
   defp to_gen_smtp_server_config({conf, {:system, var}}, config) do
     to_gen_smtp_server_config({conf, System.get_env(var)}, config)
   end