projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'refactor/oauth_controller_response' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index c859bed40f5a69de1e06f0fb1888b6e2bccef01e..b7b9d534df940fbf2acf818ee68dac1f36a720ed 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-87,7
+87,7
@@
defmodule Pleroma.Mixfile do
{:bbcode, "~> 0.1"},
{:ex_machina, "~> 2.3", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
{:bbcode, "~> 0.1"},
{:ex_machina, "~> 2.3", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
- {:mock, "~> 0.3.
1
", only: :test},
+ {:mock, "~> 0.3.
3
", only: :test},
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
{:cors_plug, "~> 1.5"},
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
{:cors_plug, "~> 1.5"},
@@
-113,7
+113,9
@@
defmodule Pleroma.Mixfile do
{:recon, github: "ferd/recon", tag: "2.4.0"},
{:quack, "~> 0.1.1"},
{:benchee, "~> 1.0"},
{:recon, github: "ferd/recon", tag: "2.4.0"},
{:quack, "~> 0.1.1"},
{:benchee, "~> 1.0"},
- {:esshd, "~> 0.1.0"}
+ {:esshd, "~> 0.1.0"},
+ {:ex_rated, "~> 1.2"},
+ {:plug_static_index_html, "~> 1.0.0"}
] ++ oauth_deps
end
] ++ oauth_deps
end