Merge branch 'features/bio_rel_me' into 'develop'

[akkoma] / mix.exs

diff --git a/mix.exs b/mix.exs
index 5392d94d1aec9f4560c339e4716a3f64202d5a3f..0fe9c6ec351dea854e4df59cbf23dc4a217ee860 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -55,9 +55,8 @@ defmodule Pleroma.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      # Until Phoenix 1.4.1 is released
-      {:phoenix, github: "phoenixframework/phoenix", branch: "v1.4"},
-      {:plug_cowboy, "~> 1.0"},
+      {:phoenix, "~> 1.4.1"},
+      {:plug_cowboy, "~> 2.0"},
       {:phoenix_pubsub, "~> 1.1"},
       {:phoenix_ecto, "~> 3.3"},
       {:postgrex, ">= 0.13.5"},