Merge branch 'linkify' into 'develop'

Fix Linkify See merge request pleroma/pleroma!2792
2020-07-23 10:28:52 +00:00 · 2020-07-23 10:28:52 +00:00 · a81581472f
commit a81581472f
parent 1c9752cff4 b6488a4db4
15 changed files with 291 additions and 52 deletions
--- a/mix.exs
+++ b/mix.exs
@ -167,9 +167,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"},