summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-15 16:39:01 -0500
committerMark Felder <feld@FreeBSD.org>2020-10-15 16:39:01 -0500
commitfb056ce05b43841ce57135ffb0b25845c41639ef (patch)
treeedd3e47128b454ab721027b5c6f30d0bcc5bd27c /mix.exs
parent724e4b7f00041667b9fa61fd1b7dd51c8eeaa102 (diff)
parent5703fb6d2a5f9fcffe050eadbc43758bcd2efa14 (diff)
downloadpleroma-fb056ce05b43841ce57135ffb0b25845c41639ef.tar.gz
pleroma-fb056ce05b43841ce57135ffb0b25845c41639ef.zip
Merge branch 'develop' into refactor/discoverable_user_field
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"},