diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-12-27 18:27:13 +0000 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-12-27 18:27:13 +0000 |
| commit | fd9260d1b500669862c839ce0168f5feeae6e2dd (patch) | |
| tree | eb1c5dfe817e717f0f2ce9570be37009234453cc /mix.exs | |
| parent | 9b5dbd20b09a7463c4dde60fe70a8264cfbd90e3 (diff) | |
| parent | 326575d5b7b39396afe14e96adb16a7f73aa55e9 (diff) | |
| download | pleroma-fd9260d1b500669862c839ce0168f5feeae6e2dd.tar.gz pleroma-fd9260d1b500669862c839ce0168f5feeae6e2dd.zip | |
Merge branch 'finch' into 'develop'
Finch support
See merge request pleroma/pleroma!3565
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -137,6 +137,7 @@ defmodule Pleroma.Mixfile do {:castore, "~> 0.1"}, {:cowlib, "~> 2.9", override: true}, {:gun, "~> 2.0.0-rc.1", override: true}, + {:finch, "~> 0.10.0"}, {:jason, "~> 1.2"}, {:mogrify, "~> 0.9.1"}, {:ex_aws, "~> 2.1.6"}, @@ -192,9 +193,7 @@ 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.git", - ref: "289cda1b6d0d70ccb2ba508a2b0bd24638db2880"}, + {:majic, "~> 1.0"}, {:eblurhash, "~> 1.1.0"}, {:open_api_spex, "~> 3.10"}, {:phoenix_live_dashboard, "~> 0.6.2"}, |