summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-02-18 09:06:27 -0600
committerMark Felder <feld@FreeBSD.org>2020-02-18 09:06:27 -0600
commitcf943492878c901cf2f0056ee2a8814e0322e9d8 (patch)
tree3ae91feb1a78eba87b627e216c035956bdba8853 /mix.exs
parent514c899275a32e6ef63305f9424c50344d41b12e (diff)
parentcf8307e71c3f68bc26a540783a3ca26766b3b56c (diff)
downloadpleroma-cf943492878c901cf2f0056ee2a8814e0322e9d8.tar.gz
pleroma-cf943492878c901cf2f0056ee2a8814e0322e9d8.zip
Merge branch 'develop' into gun
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index 7c6de5423..273307bbe 100644
--- 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,