summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorlambadalambda <gitgud@rogerbraun.net>2017-09-11 15:16:49 -0400
committerlambadalambda <gitgud@rogerbraun.net>2017-09-11 15:16:49 -0400
commit2b21c05105d550d09d85807246be696a1aed4b32 (patch)
treed389818eff185ca584449f2fb47ad7c1254fa3af /mix.exs
parent95aa6a3c651fed9810889d3446f2a1d710efb55e (diff)
parentf0d41a3abf3e584c90c96644f73d533ea0680237 (diff)
downloadpleroma-2b21c05105d550d09d85807246be696a1aed4b32.tar.gz
pleroma-2b21c05105d550d09d85807246be696a1aed4b32.zip
Merge branch 'oauth2' into 'develop'
Mastodon API See merge request !27
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs6
1 files changed, 3 insertions, 3 deletions
diff --git a/mix.exs b/mix.exs
index f5457ee08..00733c26a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -28,7 +28,7 @@ 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"},
@@ -37,12 +37,12 @@ defmodule Pleroma.Mixfile do
{:comeonin, "~> 3.0"},
{: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]},
- {:mix_test_watch, "~> 0.2", only: :dev}]
+ {:credo, "~> 0.7", only: [:dev, :test]}]
end
# Aliases are shortcuts or tasks specific to the current project.