summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-10-14 17:31:45 +0000
committerfeld <feld@feld.me>2020-10-14 17:31:45 +0000
commit20137056900f97af34f4433858cbdf69be6c9840 (patch)
tree4920c30700ae1a338eff5ce4ca9ca408cdc04bd9 /mix.exs
parent9a85ec0da095933cbddfb1dae74d035723032399 (diff)
parent40f3cdc030536d49c80fe7318ff43cd5ba011df4 (diff)
downloadpleroma-20137056900f97af34f4433858cbdf69be6c9840.tar.gz
pleroma-20137056900f97af34f4433858cbdf69be6c9840.zip
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/mix.exs b/mix.exs
index b9ce8c500..427329d38 100644
--- a/mix.exs
+++ b/mix.exs
@@ -188,6 +188,8 @@ defmodule Pleroma.Mixfile do
git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:restarter, path: "./restarter"},
+ {:majic,
+ git: "https://git.pleroma.social/pleroma/elixir-libraries/majic", branch: "develop"},
{:open_api_spex,
git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git",
ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"},