diff options
| author | feld <feld@feld.me> | 2021-02-03 14:23:23 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-02-03 14:23:23 +0000 |
| commit | 008499f65a33f5d42a98cc3719f6ab5e8def40d6 (patch) | |
| tree | 1bcf258f38105267d4f655d8aed68d1ab502523f /mix.exs | |
| parent | 39335d42513e47289fc825d04680531b84862686 (diff) | |
| parent | c3dd860a027ef1339285b5b62dc62e0b48bc6855 (diff) | |
| download | pleroma-008499f65a33f5d42a98cc3719f6ab5e8def40d6.tar.gz pleroma-008499f65a33f5d42a98cc3719f6ab5e8def40d6.zip | |
Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -194,7 +194,7 @@ defmodule Pleroma.Mixfile do {:restarter, path: "./restarter"}, {:majic, git: "https://git.pleroma.social/pleroma/elixir-libraries/majic.git", - ref: "4c692e544b28d1f5e543fb8a44be090f8cd96f80"}, + ref: "289cda1b6d0d70ccb2ba508a2b0bd24638db2880"}, {:open_api_spex, git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git", ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"}, |