Merge branch 'develop' into 'vips'
# Conflicts: # mix.exs
This commit is contained in:
commit
906b121a10
11 changed files with 24 additions and 10 deletions
2
mix.exs
2
mix.exs
|
|
@ -187,7 +187,7 @@ defmodule Pleroma.Mixfile do
|
|||
ref: "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"},
|
||||
{:captcha,
|
||||
git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
|
||||
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
|
||||
ref: "90f6ce7672f70f56708792a98d98bd05176c9176"},
|
||||
{:restarter, path: "./restarter"},
|
||||
{:majic, "~> 1.0"},
|
||||
{:open_api_spex, "~> 3.16"},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue