Merge branch 'feature/optimize_rich_media_parser' into 'develop'

added prepare html for RichMedia.Parser See merge request pleroma/pleroma!1672
2019-09-16 07:37:54 +00:00 · 2019-09-16 07:37:54 +00:00 · d1a84ceec8
commit d1a84ceec8
parent 74eba5afe2 b4cf74c106
3 changed files with 7 additions and 3 deletions
--- a/mix.exs
+++ b/mix.exs
@ -133,7 +133,7 @@ defmodule Pleroma.Mixfile do
      {:phoenix_swoosh, "~> 0.2"},
      {:gen_smtp, "~> 0.13"},
      {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
-      {:floki, "~> 0.20.0"},
+      {:floki, "~> 0.23.0"},
      {:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
      {:timex, "~> 3.5"},
      {:ueberauth, "~> 0.4"},