Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11

1 files changed, 2 insertions, 0 deletions

diff --git a/mix.exs b/mix.exs
index 185734f43..c943d3e17 100644
--- a/mix.exs
+++ b/mix.exs
@@ -191,6 +191,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"},