Merge develop

[akkoma] / mix.exs

diff --git a/mix.exs b/mix.exs
index efaa06a1c473b5d4ed792ee27e4ff27fccee42b3..bc2e552253fc3e85349f3b087f78c984e1563879 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -94,6 +94,7 @@ defmodule Pleroma.Mixfile do
       {:ex_doc, "~> 0.20.2", only: :dev, runtime: false},
       {:web_push_encryption, "~> 0.2.1"},
       {:swoosh, "~> 0.20"},
+      {:phoenix_swoosh, "~> 0.2"},
       {:gen_smtp, "~> 0.13"},
       {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
       {:floki, "~> 0.20.0"},
@@ -111,7 +112,9 @@ defmodule Pleroma.Mixfile do
       {:prometheus_ecto, "~> 1.4"},
       {:prometheus_process_collector, "~> 1.4"},
       {:recon, github: "ferd/recon", tag: "2.4.0"},
-      {:quack, "~> 0.1.1"}
+      {:quack, "~> 0.1.1"},
+      {:quantum, "~> 2.3"},
+      {:joken, "~> 2.0"}
     ] ++ oauth_deps
   end