projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-tags' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 52974c841d21f10e6cc92117ef930abd24838dd8..e9705bcf90c1877ca3d6e78bc08e8d44340d6b68 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-44,7
+44,7
@@
defmodule Pleroma.Mixfile do
defp deps do
[
# Until Phoenix 1.4.1 is released
defp deps do
[
# Until Phoenix 1.4.1 is released
- {:phoenix, github: "
feld
/phoenix", branch: "v1.4"},
+ {:phoenix, github: "
phoenixframework
/phoenix", branch: "v1.4"},
{:plug_cowboy, "~> 1.0"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 3.3"},
{:plug_cowboy, "~> 1.0"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 3.3"},
@@
-73,7
+73,8
@@
defmodule Pleroma.Mixfile do
{:ex_doc, "> 0.18.3 and < 0.20.0", only: :dev, runtime: false},
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.20"},
{:ex_doc, "> 0.18.3 and < 0.20.0", only: :dev, runtime: false},
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.20"},
- {:gen_smtp, "~> 0.13"}
+ {:gen_smtp, "~> 0.13"},
+ {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
]
end
]
end