diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-17 17:53:47 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-17 17:53:47 +0300 |
| commit | 9ea31b373fdb75bb6aa04d006e5f493158897efa (patch) | |
| tree | b7301d21a9bc675984bb11b40c96148c0205270e /mix.exs | |
| parent | a859d9bc15cd1e4ff15bb63d6c114f71783118ef (diff) | |
| parent | 023f726d7f497705d766adee8874b94efb08a0aa (diff) | |
| download | pleroma-9ea31b373fdb75bb6aa04d006e5f493158897efa.tar.gz pleroma-9ea31b373fdb75bb6aa04d006e5f493158897efa.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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"}, |