summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs7
1 files changed, 4 insertions, 3 deletions
diff --git a/mix.exs b/mix.exs
index 5b56b9490..52974c841 100644
--- a/mix.exs
+++ b/mix.exs
@@ -43,12 +43,13 @@ defmodule Pleroma.Mixfile do
# Type `mix help deps` for examples and options.
defp deps do
[
- {:phoenix, "~> 1.3.3"},
- {:phoenix_pubsub, "~> 1.0.2"},
+ # Until Phoenix 1.4.1 is released
+ {:phoenix, github: "feld/phoenix", branch: "v1.4"},
+ {:plug_cowboy, "~> 1.0"},
+ {:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 3.3"},
{:postgrex, ">= 0.13.5"},
{:gettext, "~> 0.15"},
- {:cowboy, "~> 1.1.2", override: true},
{:comeonin, "~> 4.1.1"},
{:pbkdf2_elixir, "~> 0.12.3"},
{:trailing_format_plug, "~> 0.0.7"},