Merge branch 'twitterapi-show-user' into 'develop'

[akkoma] / mix.exs

diff --git a/mix.exs b/mix.exs
index ce5ef720ee3c1f4dd920688dc29cf043919007fa..00733c26a64fe3a085b6f873159a109bd61f1af5 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -28,14 +28,21 @@ defmodule Pleroma.Mixfile do
   #
   # Type `mix help deps` for examples and options.
   defp deps do
-    [{:phoenix, "~> 1.3.0-rc"},
+    [{:phoenix, "~> 1.3.0"},
      {:phoenix_pubsub, "~> 1.0"},
      {:phoenix_ecto, "~> 3.2"},
      {:postgrex, ">= 0.0.0"},
      {:gettext, "~> 0.11"},
-     {:cowboy, "~> 1.0"},
+     {:cowboy, "~> 1.0", override: true},
      {:comeonin, "~> 3.0"},
-     {:mix_test_watch, "~> 0.2", only: :dev}]
+     {:trailing_format_plug, "~> 0.0.5" },
+     {:html_sanitize_ex, "~> 1.3.0-rc1"},
+     {:phoenix_html, "~> 2.10"},
+     {:calendar, "~> 0.16.1"},
+     {:cachex, "~> 2.1"},
+     {:httpoison, "~> 0.11.2"},
+     {:ex_machina, "~> 2.0", only: :test},
+     {:credo, "~> 0.7", only: [:dev, :test]}]
   end
 
   # Aliases are shortcuts or tasks specific to the current project.