projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 980f17a0437d688547a9fe5844fec7107a2a194b..14448f12f9511361e1894587965340025cace090 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-125,7
+125,6
@@
defmodule Pleroma.Mixfile do
{:postgrex, ">= 0.15.5"},
{:oban, "~> 2.1.0"},
{:gettext, "~> 0.18"},
{:postgrex, ">= 0.15.5"},
{:oban, "~> 2.1.0"},
{:gettext, "~> 0.18"},
- {:pbkdf2_elixir, "~> 1.2"},
{:bcrypt_elixir, "~> 2.2"},
{:trailing_format_plug, "~> 0.0.7"},
{:fast_sanitize, "~> 0.2.0"},
{:bcrypt_elixir, "~> 2.2"},
{:trailing_format_plug, "~> 0.0.7"},
{:fast_sanitize, "~> 0.2.0"},
@@
-147,8
+146,8
@@
defmodule Pleroma.Mixfile do
{:earmark, "1.4.3"},
{:bbcode_pleroma, "~> 0.2.0"},
{:crypt,
{:earmark, "1.4.3"},
{:bbcode_pleroma, "~> 0.2.0"},
{:crypt,
- git: "https://git
hub.com/msanto
s/crypt.git",
- ref: "
f63a705f92c26955977ee62a313012e309a4d77a
"},
+ git: "https://git
.pleroma.social/pleroma/elixir-librarie
s/crypt.git",
+ ref: "
cf2aa3f11632e8b0634810a15b3e612c7526f6a3
"},
{:cors_plug, "~> 2.0"},
{:web_push_encryption, "~> 0.3"},
{:swoosh, "~> 1.0"},
{:cors_plug, "~> 2.0"},
{:web_push_encryption, "~> 0.3"},
{:swoosh, "~> 1.0"},
@@
-211,7
+210,7
@@
defmodule Pleroma.Mixfile do
git: "https://git.pleroma.social/pleroma/elixir-libraries/hackney.git",
ref: "7d7119f0651515d6d7669c78393fd90950a3ec6e",
override: true},
git: "https://git.pleroma.social/pleroma/elixir-libraries/hackney.git",
ref: "7d7119f0651515d6d7669c78393fd90950a3ec6e",
override: true},
- {:mox, "~>
0.5
", only: :test},
+ {:mox, "~>
1.0
", only: :test},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
] ++ oauth_deps()
end
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
] ++ oauth_deps()
end