diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-14 12:33:24 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-14 12:33:24 -0500 |
| commit | 83770b7b391fdf8bdc22f63047b1cf444a7b16ce (patch) | |
| tree | bba3b4d867ee5cdc07165784868c28f174c10317 /mix.exs | |
| parent | 7d8f610720abdadeff9238aa8a345a91e473e0fa (diff) | |
| parent | 20137056900f97af34f4433858cbdf69be6c9840 (diff) | |
| download | pleroma-83770b7b391fdf8bdc22f63047b1cf444a7b16ce.tar.gz pleroma-83770b7b391fdf8bdc22f63047b1cf444a7b16ce.zip | |
Merge remote-tracking branch 'upstream/develop' into aliases
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"}, |