Merge branch 'develop' into gun

2020-02-18 09:06:27 -06:00 · 2020-02-18 09:06:27 -06:00 · cf94349287
commit cf94349287
parent 514c899275 cf8307e71c
19 changed files with 296 additions and 115 deletions
--- a/mix.exs
+++ b/mix.exs
@ -143,8 +143,8 @@ 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.23.0"},
      {:ex_syslogger, "~> 1.4"},
+      {:floki, "~> 0.25"},
      {:timex, "~> 3.5"},
      {:ueberauth, "~> 0.4"},
      {:auto_linker,