summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorcascode <cascode@amplifie.red>2019-01-04 20:32:55 -0800
committercascode <cascode@amplifie.red>2019-01-04 20:32:55 -0800
commita81307251c7dde298013003373e9cd28ebd9dede (patch)
tree973e4022c9d44a18ea13f1923195f56969608daa /mix.exs
parent4c5ee4c62bb68982bf286b302dec77468a6d19b5 (diff)
parentba17518a0aff404e265f4aebec1257912ad2750c (diff)
downloadpleroma-a81307251c7dde298013003373e9cd28ebd9dede.tar.gz
pleroma-a81307251c7dde298013003373e9cd28ebd9dede.zip
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index efdd4b7ed..0b8052d0a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -75,7 +75,8 @@ defmodule Pleroma.Mixfile do
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.20"},
{:gen_smtp, "~> 0.13"},
- {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
+ {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
+ {:floki, "~> 0.20.0"}
]
end