Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / mix.exs

diff --git a/mix.exs b/mix.exs
index 41542eafd2a0c9c63947fd4ebf931c7354a0173e..c9aeeae664ea620688dbdf024dc9c5fe2e72acd5 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -63,7 +63,7 @@ defmodule Pleroma.Mixfile do
   def application do
     [
       mod: {Pleroma.Application, []},
-      extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :myhtmlex, :swarm],
+      extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :fast_sanitize, :swarm],
       included_applications: [:ex_syslogger]
     ]
   end
@@ -108,10 +108,8 @@ defmodule Pleroma.Mixfile do
       {:comeonin, "~> 4.1.1"},
       {:pbkdf2_elixir, "~> 0.12.3"},
       {:trailing_format_plug, "~> 0.0.7"},
-      {:fast_sanitize,
-       git: "https://git.pleroma.social/pleroma/fast_sanitize.git",
-       ref: "1af67547a02a104e26c99d03012383e8643bc4c2"},
-      {:html_entities, "~> 0.4"},
+      {:fast_sanitize, "~> 0.1"},
+      {:html_entities, "~> 0.5", override: true},
       {:phoenix_html, "~> 2.10"},
       {:calendar, "~> 0.17.4"},
       {:cachex, "~> 3.0.2"},