summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-09-08 09:20:34 +0000
committerlambda <pleromagit@rogerbraun.net>2018-09-08 09:20:34 +0000
commit045953225e04862c914b51808907cc86b11fcaf4 (patch)
tree8f629e1572eec131651eae1a4421b6725b6f189a /mix.exs
parent530561a091f6f82e27ef3d5011b929b00e2da964 (diff)
parentd22af29bb48e94ca21621c30d46cea42559277b7 (diff)
downloadpleroma-045953225e04862c914b51808907cc86b11fcaf4.tar.gz
pleroma-045953225e04862c914b51808907cc86b11fcaf4.zip
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
auth overhaul and legacy GS auth See merge request pleroma/pleroma!331
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs4
1 files changed, 3 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index 6b95eeec3..24c7108a0 100644
--- a/mix.exs
+++ b/mix.exs
@@ -50,7 +50,9 @@ defmodule Pleroma.Mixfile do
{:ex_aws_s3, "~> 2.0"},
{:ex_machina, "~> 2.2", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
- {:mock, "~> 0.3.1", only: :test}
+ {:mock, "~> 0.3.1", only: :test},
+ {:crypt,
+ git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"}
]
end