diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-19 15:40:03 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-19 15:40:03 +0400 |
| commit | 76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f (patch) | |
| tree | ffc5e72a54b1fe1289038e934fb20eb6c1431b4f /mix.exs | |
| parent | 2b58b0dbce36042a8acbb41a8ddc8696d2e00d0e (diff) | |
| parent | 0495a07dc77d81abf46cbe166ae3fec14f705809 (diff) | |
| download | pleroma-76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f.tar.gz pleroma-76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f.zip | |
Merge branch 'develop' into mutes-blocks-pagination
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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"}, |