Merge branch 'patch-2' into 'develop'

Update mix.exs

See merge request pleroma/pleroma!241
This commit is contained in:
kaniini 2018-08-16 15:45:12 +00:00
commit 8c3880f18c

34
mix.exs
View file

@ -30,25 +30,25 @@ defmodule Pleroma.Mixfile do
# Type `mix help deps` for examples and options. # Type `mix help deps` for examples and options.
defp deps do defp deps do
[ [
{:phoenix, "~> 1.3.0"}, {:phoenix, "~> 1.3.3"},
{:phoenix_pubsub, "~> 1.0"}, {:phoenix_pubsub, "~> 1.0.2"},
{:phoenix_ecto, "~> 3.2"}, {:phoenix_ecto, "~> 3.3"},
{:postgrex, ">= 0.0.0"}, {:postgrex, ">= 0.13.5"},
{:gettext, "~> 0.11"}, {:gettext, "~> 0.15"},
{:cowboy, "~> 1.0", override: true}, {:cowboy, "~> 1.1.2", override: true},
{:comeonin, "~> 4.0"}, {:comeonin, "~> 4.1.1"},
{:pbkdf2_elixir, "~> 0.12"}, {:pbkdf2_elixir, "~> 0.12.3"},
{:trailing_format_plug, "~> 0.0.5"}, {:trailing_format_plug, "~> 0.0.7"},
{:html_sanitize_ex, "~> 1.3.0-rc1"}, {:html_sanitize_ex, "~> 1.3.0"},
{:phoenix_html, "~> 2.10"}, {:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.16.1"}, {:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0"}, {:cachex, "~> 3.0.2"},
{:httpoison, "~> 1.1.0"}, {:httpoison, "~> 1.2.0"},
{:jason, "~> 1.0"}, {:jason, "~> 1.0"},
{:ex_machina, "~> 2.0", only: :test}, {:mogrify, "~> 0.6.1"},
{:credo, "~> 0.7", only: [:dev, :test]}, {:ex_machina, "~> 2.2", only: :test},
{:mock, "~> 0.3.0", only: :test}, {:credo, "~> 0.9.3", only: [:dev, :test]},
{:mogrify, "~> 0.6.1"} {:mock, "~> 0.3.1", only: :test}
] ]
end end