diff options
| author | feld <feld@feld.me> | 2020-12-12 19:20:34 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-12-12 19:20:34 +0000 |
| commit | 1e3eb9e0044b0a1d02f63f897cf2fdf0e90ef1ea (patch) | |
| tree | 140880475f8c67a3314bb4fe9e856d74ec84edbd /mix.exs | |
| parent | f2bf2131b4721eb579d248bfc4913a80801efcb7 (diff) | |
| parent | 7d78c000493506f76f50641f52c9c651d99838c9 (diff) | |
| download | pleroma-1e3eb9e0044b0a1d02f63f897cf2fdf0e90ef1ea.tar.gz pleroma-1e3eb9e0044b0a1d02f63f897cf2fdf0e90ef1ea.zip | |
Merge branch 'fix/tracking-majic' into 'develop'
Majic: specify commit so source users do not get surprise updates
See merge request pleroma/pleroma!3200
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -194,7 +194,8 @@ defmodule Pleroma.Mixfile do ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"}, {:restarter, path: "./restarter"}, {:majic, - git: "https://git.pleroma.social/pleroma/elixir-libraries/majic.git", branch: "develop"}, + git: "https://git.pleroma.social/pleroma/elixir-libraries/majic.git", + ref: "4c692e544b28d1f5e543fb8a44be090f8cd96f80"}, {:open_api_spex, git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git", ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"}, |