summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-07-21 16:25:45 -0500
committerMark Felder <feld@FreeBSD.org>2020-07-21 16:25:45 -0500
commit97c60b6a4308b77d0e4956b83a16b88292b62e37 (patch)
treedb496d0f94e00b199be95ee285174f378f512daa /mix.exs
parent7ce722ce3e3dbc633324ff0ccaeddc467397ac5e (diff)
parent2b5d9eb10529325aef1b4aab980bd901ba6b0c70 (diff)
downloadpleroma-97c60b6a4308b77d0e4956b83a16b88292b62e37.tar.gz
pleroma-97c60b6a4308b77d0e4956b83a16b88292b62e37.zip
Merge branch 'develop' into fix/pleroma-api-emoji-packs
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs4
1 files changed, 1 insertions, 3 deletions
diff --git a/mix.exs b/mix.exs
index 52b4cf268..f44d7a887 100644
--- a/mix.exs
+++ b/mix.exs
@@ -166,9 +166,7 @@ defmodule Pleroma.Mixfile do
{:floki, "~> 0.25"},
{:timex, "~> 3.5"},
{:ueberauth, "~> 0.4"},
- {:auto_linker,
- git: "https://git.pleroma.social/pleroma/auto_linker.git",
- ref: "95e8188490e97505c56636c1379ffdf036c1fdde"},
+ {:linkify, "~> 0.2.0"},
{:http_signatures,
git: "https://git.pleroma.social/pleroma/http_signatures.git",
ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"},