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 0e8a7026c18b1d3c59b6dec9f63ba27cb9a16bc3..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"},