diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-03-01 09:42:34 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-03-01 09:42:34 +0000 |
| commit | b37b26ab87a60d6fb5c9c208a13ed7521aba3fbd (patch) | |
| tree | e5d52e60f8968ed8ece5029459c7d73036e026fd /mix.exs | |
| parent | a47cc5a2cf808b6a06d4d17f195b6a98458ad89d (diff) | |
| parent | 6b2a1ad1c84b7ef350b0d0be76d6b2e03c633260 (diff) | |
| download | pleroma-b37b26ab87a60d6fb5c9c208a13ed7521aba3fbd.tar.gz pleroma-b37b26ab87a60d6fb5c9c208a13ed7521aba3fbd.zip | |
Merge branch 'feature/cowboy2' into 'develop'
upgrade to cowboy 2.6
See merge request pleroma/pleroma!876
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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"}, |